From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 19 Dec 2016 17:20:47 +0000 (+0100)
Subject: Unconfuse the RPZ summary
X-Git-Tag: rec-4.1.0-alpha1~348^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00febe394033d2ea53ecbcf135ac94de6ba4be08;p=thirdparty%2Fpdns.git

Unconfuse the RPZ summary

Closes #4342
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index ad165c4366..99eae9c6cd 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -349,7 +349,6 @@ void RPZIXFRTracker(const ComboAddress& master, const DNSName& zone, boost::opti
       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);
 	  if(oldsr && oldsr->d_st.serial == oursr->d_st.serial) {
@@ -359,6 +358,7 @@ void RPZIXFRTracker(const ComboAddress& master, const DNSName& zone, boost::opti
 	    L<<Logger::Error<<"GOT WRONG SOA SERIAL REMOVAL, SHOULD TRIGGER WHOLE RELOAD"<<endl;
 	}
 	else {
+          totremove++;
 	  L<<Logger::Info<<"Had removal of "<<rr.d_name<<endl;
 	  RPZRecordToPolicy(rr, luaconfsCopy.dfe, false, defpol, polZone);
 	}
@@ -367,7 +367,6 @@ void RPZIXFRTracker(const ComboAddress& master, const DNSName& zone, boost::opti
       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);
 	  //	  L<<Logger::Info<<"New SOA serial for "<<zone<<": "<<newsr->d_st.serial<<endl;
@@ -376,6 +375,7 @@ void RPZIXFRTracker(const ComboAddress& master, const DNSName& zone, boost::opti
 	  }
 	}
 	else {
+          totadd++;
 	  L<<Logger::Info<<"Had addition of "<<rr.d_name<<endl;
 	  RPZRecordToPolicy(rr, luaconfsCopy.dfe, true, defpol, polZone);
 	}