]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
fix a regression in axfr-rectify introduced by commit d86e1bf7
authorKees Monshouwer <mind04@monshouwer.org>
Thu, 23 Feb 2017 23:36:15 +0000 (00:36 +0100)
committerArthur Gautier <baloo@gandi.net>
Thu, 11 May 2017 17:52:03 +0000 (17:52 +0000)
pdns/tcpreceiver.cc

index e2540935a257ee7c7d6e85b8d57fc80f58fc5a4f..eb00628f7986add9a3d3f01fd94409b490a69497 100644 (file)
@@ -787,9 +787,7 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr<DNSPacket> q, int ou
           zrr.dr.d_content = ip.dr.d_content;
           zrrs.push_back(zrr);
         }
-      }
-      else {
-        zrrs.push_back(zrr);
+        continue;
       }
 
       if (rectify) {
@@ -802,6 +800,7 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr<DNSPacket> q, int ou
           continue;
         }
       }
+      zrrs.push_back(zrr);
     } else {
       if (zrr.dr.d_type)
         L<<Logger::Warning<<"Zone '"<<target<<"' contains out-of-zone data '"<<zrr.dr.d_name<<"|"<<DNSRecordContent::NumberToType(zrr.dr.d_type)<<"', ignoring"<<endl;