]> granicus.if.org Git - pdns/commitdiff
Squash compiler warnings
authorAki Tuomi <cmouse@desteem.org>
Tue, 22 Dec 2015 16:13:45 +0000 (18:13 +0200)
committerAki Tuomi <cmouse@desteem.org>
Fri, 8 Jan 2016 06:57:37 +0000 (08:57 +0200)
pdns/validate.cc

index 7714f2e09a80a9e48040b9dc95811d97edd1307b..00eb0f04cf9c16b1e3228e40a1d209061b863c02 100644 (file)
@@ -3,6 +3,7 @@
 #include "dnssecinfra.hh"
 #include "rec-lua-conf.hh"
 #include "base32.hh"
+#include "logger.hh"
 
 void dotEdge(DNSName zone, string type1, DNSName name1, string tag1, string type2, DNSName name2, string tag2, string color="");
 void dotNode(string type, DNSName name, string tag, string content);
@@ -103,10 +104,10 @@ void validateWithKeySet(const cspmap_t& rrsets, cspmap_t& validated, const keyse
          if(signature->d_siginception < now && signature->d_sigexpire > now)
            isValid = DNSCryptoKeyEngine::makeFromPublicKeyString(l.d_algorithm, l.d_key)->verify(msg, signature->d_signature);
          else
-           ; // cerr<<"signature is expired/not yet valid ";
+           DLOG(cerr<<"signature is expired/not yet valid"<<endl);
        }
        catch(std::exception& e) {
-         // cerr<<"Error validating with engine: "<<e.what()<<endl;
+         DLOG(cerr<<"Error validating with engine: "<<e.what()<<endl);
        }
        if(isValid) {
          validated[i->first] = i->second;
@@ -114,7 +115,7 @@ void validateWithKeySet(const cspmap_t& rrsets, cspmap_t& validated, const keyse
          //      cerr<<"! validated "<<i->first.first<<"/"<<DNSRecordContent::NumberToType(signature->d_type)<<endl;
        }
        else 
-         ; // cerr<<"signature invalid"<<endl;
+          DLOG(cerr<<"signature invalid"<<endl);
        if(signature->d_type != QType::DNSKEY) {
          dotEdge(signature->d_signer,
                  "DNSKEY", signature->d_signer, std::to_string(signature->d_tag),
@@ -284,7 +285,7 @@ vState getKeysFor(DNSRecordOracle& dro, const DNSName& zone, keyset_t &keyset)
             break;
           }
          else
-           ; // cerr<<"Validation did not succeed!"<<endl;
+           DLOG(cerr<<"Validation did not succeed!"<<endl);
         }
        //        if(validkeys.empty()) cerr<<"did not manage to validate DNSKEY set based on DS-validated KSK, only passing KSK on"<<endl;
       }