From: Kees Monshouwer <mind04@monshouwer.org>
Date: Thu, 23 Feb 2017 23:36:15 +0000 (+0100)
Subject: fix a regression in axfr-rectify introduced by commit d86e1bf7
X-Git-Tag: rec-4.1.0-alpha1~115^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a68df29d25b2ee9d9bfe0987fbebd7e19e960355;p=thirdparty%2Fpdns.git

fix a regression in axfr-rectify introduced by commit d86e1bf7
---

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index e2540935a2..eb00628f79 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -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;