]> granicus.if.org Git - pdns/commitdiff
Merge pull request #4388 from rgacogne/rec-rpz-default-policy-ixfr
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Mon, 5 Sep 2016 08:33:24 +0000 (10:33 +0200)
committerGitHub <noreply@github.com>
Mon, 5 Sep 2016 08:33:24 +0000 (10:33 +0200)
rec: Fix RPZ default policy not being applied over IXFR

1  2 
pdns/rec-lua-conf.cc
pdns/reczones.cc

Simple merge
index 9df123ddfead4fdd12c1a6d3ebe718086eec2f8c,12237aa3341505e9982ba677a57417d9ce42cc22..c5b17034f4c819027df3c5634ffe04ecdeb4ad75
@@@ -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);