Changeset 1754

Timestamp:

12/19/10 21:13:18 (2 years ago)

Author:

ahu

Message:

clean up some dnssec logging

Location:

trunk/pdns/pdns

Files:

• dnspacket.cc (modified) (1 diff)
• dnssecinfra.cc (modified) (1 diff)

trunk/pdns/pdns/dnspacket.cc

@@ -395 +395 @@
       }
       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);
       }

trunk/pdns/pdns/dnssecinfra.cc

@@ -220 +220 @@
       }
       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);
   }