From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 9 Sep 2013 20:19:01 +0000 (+0200)
Subject: check for duplicate records with pdnssec check-all-zones (Issue #607)
X-Git-Tag: rec-3.6.0-rc1~447^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=befcd641d28a67f8be64162bef37138c009d62ea;p=thirdparty%2Fpdns.git

check for duplicate records with pdnssec check-all-zones (Issue #607)
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 75d628bfd8..345414249e 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -341,7 +341,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
   DNSResourceRecord rr;
   uint64_t numrecords=0, numerrors=0, numwarnings=0;
   
-  set<string> cnames, noncnames;
+  set<string> records, cnames, noncnames;
 
   while(sd.db->get(rr)) {
     if(!endsOn(rr.qname, zone)) {
@@ -353,6 +353,18 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
     if(!rr.qtype.getCode())
       continue;
 
+    ostringstream content;
+    content<<rr.qname<<" "<<rr.qtype.getName();
+    if (rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV)
+      content<<" "<<rr.priority;
+    content<<" "<<rr.content;
+    if (records.count(content.str())) {
+      cout<<"[Error] Duplicate record found '"<<content.str()<<"' This do not belong in the database."<<endl;
+      numerrors++;
+      continue;
+    } else
+      records.insert(content.str());
+
     if (rr.qtype.getCode() == QType::CNAME) {
       if (!cnames.count(rr.qname))
         cnames.insert(rr.qname);
@@ -366,6 +378,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
         if(!dk.isPresigned(zone)) {
           cout<<"[Error] RRSIG found at '"<<rr.qname<<"' in non-presigned zone. These do not belong in the database."<<endl;
           numerrors++;
+          continue;
         }
       } else
         noncnames.insert(rr.qname);