From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 23 Dec 2015 13:43:32 +0000 (+0100)
Subject: make show-zone pretend -v was passed always; revert this later
X-Git-Tag: dnsdist-1.0.0-alpha1~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c283741cd9c5764b918cd7cdd139e50d1d7f8973;p=thirdparty%2Fpdns.git

make show-zone pretend -v was passed always; revert this later
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 37f7b81511..0813efa83a 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -1150,9 +1150,9 @@ bool showZone(DNSSECKeeper& dk, const DNSName& zone)
       }
       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()<<"\t"<<((int)value.second.active == 1 ? "  A" : "Ina")<<"ctive ( " + algname + " ) "<<endl;
-      if(value.second.keyOrZone || ::arg().mustDo("direct-dnskey") || g_verbose)
+      if(value.second.keyOrZone || ::arg().mustDo("direct-dnskey") || 1)
         cout<<(value.second.keyOrZone ? "KSK" : "ZSK")<<" DNSKEY = "<<zone.toString()<<" IN DNSKEY "<< value.first.getDNSKEY().getZoneRepresentation() << " ; ( "  + algname + " )" << endl;
-      if(value.second.keyOrZone || g_verbose) {
+      if(value.second.keyOrZone || 1) {
         cout<<"DS = "<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, value.first.getDNSKEY(), 1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
         cout<<"DS = "<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, value.first.getDNSKEY(), 2).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
         try {