From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sun, 19 Dec 2010 20:13:18 +0000 (+0000)
Subject: clean up some dnssec logging
X-Git-Tag: auth-3.0~493
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdc78948a773c17f98b028681b69a7e50a8ed992;p=pdns

clean up some dnssec logging


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1754 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 7d7fc5c7a..9b86bffdc 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -394,7 +394,7 @@ void DNSPacket::wrapup(void)
 	}
       }
       if(d_dnssecOk && !(d_tcp && d_rrs.rbegin()->qtype.getCode() == QType::SOA && d_rrs.rbegin()->priority == 1234)) {
-	cerr<<"Last signature.. "<<d_tcp<<", "<<d_rrs.rbegin()->priority<<", "<<d_rrs.rbegin()->qtype.getCode()<<", "<< d_rrs.size()<<endl;
+	// cerr<<"Last signature.. "<<d_tcp<<", "<<d_rrs.rbegin()->priority<<", "<<d_rrs.rbegin()->qtype.getCode()<<", "<< d_rrs.size()<<endl;
 	addSignature(::arg()["key-repository"], signQName, wildcardQName, signQType, signTTL, signPlace, toSign, pw);
       }
 
diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index 4d37b2dee..3fb90925b 100644
--- a/pdns/dnssecinfra.cc
+++ b/pdns/dnssecinfra.cc
@@ -219,17 +219,17 @@ DNSKEYRecordContent getDNSKEYFor(const std::string& keyRepositoryDir, const std:
         return value.first.getDNSKEY();
       }
       else 
-        cerr<<"Found an expired ZSK for '"<<qname<<"', key tag = "<<value.first.getDNSKEY().getTag()<<endl;
+        cerr<<"Found an inactive ZSK for '"<<qname<<"', key tag = "<<value.first.getDNSKEY().getTag()<<endl;
     }
-    cerr<<"withKSK was not true, but found nothing!"<<endl;
+    cerr<<"Could not find an active ZSK for '"<<qname<<"'"<<endl;
     exit(1);
   }
   else if(dk.haveKSKFor(qname, &dpk)) {
-    cerr<<"Found something"<<endl;
+    cerr<<"Found a KSK for '"<<qname<<"'"<<endl;
     *rc=dpk.d_key;
     return dpk.getDNSKEY();
   } else {
-      cerr<<"DID NOT FIND A ZSK!"<<endl;
+      cerr<<"DID NOT FIND A ZSK for '"<<qname<<"'"<<endl;
       exit(1);
   }
 }