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 7d7fc5c7a1c4dc8eabf1da37e4998fbaf5f3741b..9b86bffdc0b068fdff20f4e84a9f5fc8ce185408 100644 (file)
--- 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 4d37b2deee4babc20b44879bf99a960b4c973f84..3fb90925beee98b50bcea393b4dffffd727df5d6 100644 (file)
--- 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);
   }
 }