From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 5 Dec 2016 13:53:06 +0000 (+0000)
Subject: Make export-zone-ds output similar to export-zone-dnskey
X-Git-Tag: dnsdist-1.1.0-beta2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dd7cf3d7104306961c93bc71fcc4da9d7b8f3e5;p=thirdparty%2Fpdns.git

Make export-zone-ds output similar to export-zone-dnskey
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 794dfcf293..092fd81e9d 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -1664,7 +1664,7 @@ bool showZone(DNSSECKeeper& dk, const DNSName& zone, bool exportDS = false)
       if (shown) continue;
       shown=true;
 
-      const std::string prefix(exportDS ? "DS = " : "");
+      const std::string prefix(exportDS ? "" : "DS = ");
       cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, 1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
       cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, 2).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
       try {
@@ -1713,7 +1713,7 @@ bool showZone(DNSSECKeeper& dk, const DNSName& zone, bool exportDS = false)
       }
       if (value.second.keyType == DNSSECKeeper::KSK || value.second.keyType == DNSSECKeeper::CSK) {
         const auto &key = value.first.getDNSKEY();
-        const std::string prefix(exportDS ? "DS = " : "");
+        const std::string prefix(exportDS ? "" : "DS = ");
         cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, 1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
         cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, 2).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
         try {