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

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index b1b687e13d746887fa6483758c964573adb340d8..1594bb11107290ad2b87ed33a5ef44ee0c2e4039 100644 (file)
--- 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;