From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 29 Jan 2016 12:29:20 +0000 (+0100)
Subject: don't sweat tailing dots on SOA records in checkZone
X-Git-Tag: dnsdist-1.0.0-alpha2~24^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=657c0bf7d754fcfa6e0686db9062bf9c165a31bc;p=thirdparty%2Fpdns.git

don't sweat tailing dots on SOA records in checkZone
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 8ceb2f1f8b..f6b2071eba 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -495,8 +495,13 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect
       tmp = drc->getZoneRepresentation(true);
       if (rr.qtype.getCode() != QType::AAAA) {
         if (!pdns_iequals(tmp, rr.content)) {
-          cout<<"[Warning] Parsed and original record content are not equal: "<<rr.qname.toString()<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"' (Content parsed as '"<<tmp<<"')"<<endl;
-          numwarnings++;
+          if(rr.qtype.getCode() == QType::SOA) {
+            tmp = drc->getZoneRepresentation(false);
+          }
+          if(!pdns_iequals(tmp, rr.content)) {
+            cout<<"[Warning] Parsed and original record content are not equal: "<<rr.qname.toString()<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"' (Content parsed as '"<<tmp<<"')"<<endl;
+            numwarnings++;
+          }
         }
       } else {
         struct in6_addr tmpbuf;