- Fix to make auth zone IXFR to fallback to AXFR if a single

  response RR is received over TCP with the SOA in it.

diff --git a/doc/Changelog b/doc/Changelog
index 1fca26b643fdfa7e1877f78fa0704987caf6e886..c278776096a1fb29149fbb5891dde734622837bd 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+10 December 2019: Wouter
+       - Fix to make auth zone IXFR to fallback to AXFR if a single
+         response RR is received over TCP with the SOA in it.
+
 6 December 2019: Wouter
        - Fix ipsecmod compile.
        - Fix Makefile.in for ipset module compile, from Adi Prasaja.

diff --git a/services/authzone.c b/services/authzone.c
index 7d806d9d59d06d9400c8b901669f7b040dbd1864..9621d6ee328a488e85527be7d4b38fe273d627fe 100644 (file)
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -5530,9 +5530,12 @@ check_xfer_packet(sldns_buffer* pkt, struct auth_xfer* xfr,
                                xfr->task_transfer->rr_scan_num == 0 &&
                                LDNS_ANCOUNT(wire)==1) {
                                verbose(VERB_ALGO, "xfr to %s ended, "
-                                       "IXFR reply that zone has serial %u",
+                                       "IXFR reply that zone has serial %u,"
+                                       " fallback from IXFR to AXFR",
                                        xfr->task_transfer->master->host,
                                        (unsigned)serial);
+                               xfr->task_transfer->ixfr_fail = 1;
+                               *gonextonfail = 0;
                                return 0;
                        }