From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 21 Oct 2014 11:28:20 +0000 (+0000)
Subject: honor SOA-EDIT while considering "empty IXFR" fallback, fixes #1835
X-Git-Tag: rec-3.7.0-rc1~199^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24d9e5140a8119cfcd33260043504f05c4589b48;p=thirdparty%2Fpdns.git

honor SOA-EDIT while considering "empty IXFR" fallback, fixes #1835
---

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index b1b687e13d..1594bb1110 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1008,7 +1008,10 @@ int TCPNameserver::doIXFR(shared_ptr<DNSPacket> q, int outsock)
     sendPacket(outpacket,outsock);
     return 0;
   }
-  if (!rfc1982LessThan(serial, sd.serial)) {
+
+  string soaedit;
+  dk.getFromMeta(target, "SOA-EDIT", soaedit);
+  if (!rfc1982LessThan(serial, calculateEditSOA(sd, soaedit))) {
     TSIGRecordContent trc;
     string tsigkeyname, tsigsecret;