From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sun, 29 Sep 2013 17:11:32 +0000 (+0200)
Subject: pdnssec check-zone, fix record counting and improve out of zone check
X-Git-Tag: rec-3.6.0-rc1~430^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1037%2Fhead;p=thirdparty%2Fpdns.git

pdnssec check-zone, fix record counting and improve out of zone check
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index d4e4714bb7..365a30ee0e 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -354,11 +354,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
     if(!rr.qtype.getCode())
       continue;
 
-    if(!endsOn(rr.qname, zone)) {
-      cout<<"[Warning] Record '"<<rr.qname<<" IN "<<rr.qtype.getName()<<" "<<rr.content<<"' in zone '"<<zone<<"' is out-of-zone."<<endl;
-      numwarnings++;
-      continue;
-    }
+    numrecords++;
 
     if(rr.qtype.getCode() == QType::SOA) {
       vector<string>parts;
@@ -396,6 +392,12 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       continue;
     }
 
+    if(!endsOn(rr.qname, zone)) {
+      cout<<"[Warning] Record '"<<rr.qname<<" IN "<<rr.qtype.getName()<<" "<<rr.content<<"' in zone '"<<zone<<"' is out-of-zone."<<endl;
+      numwarnings++;
+      continue;
+    }
+
     content.str("");
     content<<rr.qname<<" "<<rr.qtype.getName()<<" "<<rr.content;
     if (records.count(toLower(content.str()))) {
@@ -500,7 +502,6 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       cout<<"[Error] Following record is auth=0, run pdnssec rectify-zone?: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " " << rr.content<<endl;
       numerrors++;
     }
-    numrecords++;
   }
 
   for(set<string>::const_iterator i = cnames.begin(); i != cnames.end(); i++) {