]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #4416 from pieterlexis/backport-4402
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Mon, 5 Sep 2016 13:47:52 +0000 (15:47 +0200)
committerGitHub <noreply@github.com>
Mon, 5 Sep 2016 13:47:52 +0000 (15:47 +0200)
Backport #4402: Ignore NS records in a RPZ zone received over IXFR

1  2 
pdns/reczones.cc

index 12237aa3341505e9982ba677a57417d9ce42cc22,97e1e84fac58d88ce4d3116c987885483dbd5f45..a2ac7b3c6a0f29d3cdf1cf7d3146312ce4d63e50
@@@ -344,9 -344,11 +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);