From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 15 Jul 2013 15:11:57 +0000 (+0200)
Subject: output ZSK DNSKEY records if experimental-direct-dnskey support is enabled
X-Git-Tag: rec-3.6.0-rc1~562^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F916%2Fhead;p=thirdparty%2Fpdns.git

output ZSK DNSKEY records if experimental-direct-dnskey support is enabled
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 63906ec3c8..5e6614a0dd 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -687,9 +687,10 @@ bool showZone(DNSSECKeeper& dk, const std::string& zone)
       string algname;
       algorithm2name(value.first.d_algorithm, algname);
       cout<<"ID = "<<value.second.id<<" ("<<(value.second.keyOrZone ? "KSK" : "ZSK")<<"), tag = "<<value.first.getDNSKEY().getTag();
-      cout<<", algo = "<<(int)value.first.d_algorithm<<", bits = "<<value.first.getKey()->getBits()<<"\tActive: "<<value.second.active<< " ( " + algname + " ) "<<endl; 
+      cout<<", algo = "<<(int)value.first.d_algorithm<<", bits = "<<value.first.getKey()->getBits()<<"\tActive: "<<value.second.active<< " ( " + algname + " ) "<<endl;
+      if(value.second.keyOrZone || ::arg().mustDo("experimental-direct-dnskey"))
+        cout<<(value.second.keyOrZone ? "KSK" : "ZSK")<<" DNSKEY = "<<zone<<" IN DNSKEY "<< value.first.getDNSKEY().getZoneRepresentation() << " ; ( "  + algname + " )" << endl;
       if(value.second.keyOrZone) {
-        cout<<"KSK DNSKEY = "<<zone<<" IN DNSKEY "<< value.first.getDNSKEY().getZoneRepresentation() << " ; ( "  + algname + " )" << endl;
         cout<<"DS = "<<zone<<" IN DS "<<makeDSFromDNSKey(zone, value.first.getDNSKEY(), 1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
         cout<<"DS = "<<zone<<" IN DS "<<makeDSFromDNSKey(zone, value.first.getDNSKEY(), 2).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
         try {