From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 5 Sep 2016 08:33:24 +0000 (+0200)
Subject: Merge pull request #4388 from rgacogne/rec-rpz-default-policy-ixfr
X-Git-Tag: dnsdist-1.1.0-beta2~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b9a2094da2f184824430d4e026d36e07c56a543;p=thirdparty%2Fpdns.git

Merge pull request #4388 from rgacogne/rec-rpz-default-policy-ixfr

rec: Fix RPZ default policy not being applied over IXFR
---

7b9a2094da2f184824430d4e026d36e07c56a543
diff --cc pdns/reczones.cc
index 9df123ddfe,12237aa334..c5b17034f4
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@@ -344,11 -344,9 +344,11 @@@ void RPZIXFRTracker(const ComboAddress
        const auto& add = delta.second;
        if(remove.empty()) {
          L<<Logger::Warning<<"IXFR update is a whole new zone"<<endl;
-         luaconfsCopy.dfe.clear(0);
+         luaconfsCopy.dfe.clear(polZone);
        }
        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);