From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 2 Sep 2016 07:57:54 +0000 (+0200)
Subject: rec: Ignore NS records in a RPZ zone received over IXFR
X-Git-Tag: rec-4.0.3~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4416%2Fhead;p=thirdparty%2Fpdns.git

rec: Ignore NS records in a RPZ zone received over IXFR

They are already ignored over AXFR, but not over IXFR.
Reported and based on a patch by @42wim (thanks!).

(cherry picked from commit ed8c725224b5192367149897cfaaaf188ab0b910)
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 63ccb27e3b..97e1e84fac 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -347,6 +347,8 @@ void RPZIXFRTracker(const ComboAddress& master, const DNSName& zone, size_t polZ
         luaconfsCopy.dfe.clear(0);
       }
       for(const auto& rr : remove) { // should always contain the SOA
+        if(rr.d_type == QType::NS)
+          continue;
 	totremove++;
 	if(rr.d_type == QType::SOA) {
 	  auto oldsr = getRR<SOARecordContent>(rr);
@@ -363,6 +365,8 @@ void RPZIXFRTracker(const ComboAddress& master, const DNSName& zone, size_t polZ
       }
 
       for(const auto& rr : add) { // should always contain the new SOA
+        if(rr.d_type == QType::NS)
+          continue;
 	totadd++;
 	if(rr.d_type == QType::SOA) {
 	  auto newsr = getRR<SOARecordContent>(rr);