From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 28 Dec 2015 11:48:13 +0000 (+0200)
Subject: Update output
X-Git-Tag: dnsdist-1.0.0-alpha2~94^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc032b91a76f0bb7068d95f11b7df7bbe70a41f;p=thirdparty%2Fpdns.git

Update output
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 1a688ee2a0..e4da9e4423 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -1153,11 +1153,20 @@ bool showZone(DNSSECKeeper& dk, const DNSName& zone)
     cout << "keys: "<<endl;
     sort(keys.begin(),keys.end());
     reverse(keys.begin(),keys.end());
+    bool shown=false;
     for(const auto& key : keys) {
       string algname;
       algorithm2name(key.d_algorithm,algname);
-      cout << "tag = " << key.getTag() << ", algo = "<<(int)key.d_algorithm<<endl;
-      cout << (key.d_flags == 257 ? "KSK" : "ZSK") << " DNSKEY = " << key.getZoneRepresentation() << "; ( " + algname + " ) " <<endl;
+      int bits;
+      if (key.d_key[0] == 0)
+        bits = *(uint16_t*)(key.d_key.c_str()+1);
+      else
+        bits = *(uint8_t*)key.d_key.c_str();
+      bits = (key.d_key.size() - (bits+1))*8;
+      cout << (key.d_flags == 257 ? "KSK" : "ZSK") << ", tag = " << key.getTag() << ", algo = "<<(int)key.d_algorithm << ", bits = " << bits << endl;
+      cout << "DNSKEY = " <<zone.toString()<<" IN DNSKEY "<< key.getZoneRepresentation() << "; ( " + algname + " ) " <<endl;
+      if (shown) continue;
+      shown=true;
       cout<<"DS = "<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, 1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
       cout<<"DS = "<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, 2).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
       try {