Move "zone show" from DNSSEC to main zone command section.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/docs/manpages/pdnsutil.1.rst b/docs/manpages/pdnsutil.1.rst
index 52bff7450f9542406d730a77b67694b2e961e883..29f9f43c5f659a6d0c86aa968a3a96390773a15f 100644 (file)
--- a/docs/manpages/pdnsutil.1.rst
+++ b/docs/manpages/pdnsutil.1.rst
@@ -376,7 +376,8 @@ zone set-publish-cds *ZONE* [*DIGESTALGOS*]
 
 zone show *ZONE*
 
-    Shows all DNSSEC related settings of a zone called *ZONE*.
+    Shows various details of the zone called *ZONE*, including its
+    DNSSEC related settings.
 
 zone unset-nsec3 *ZONE*
 

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 6953d6cb871a9129e0d9ee43a22a6890526db89e..05e407e89074763f3d0b7617f83ff38c7441d135 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -377,6 +377,9 @@ static const groupCommandDispatcher zoneMainCommands{
    {"set-options-json", {true, setOptionsJson,
     "ZONE JSONFILE",
     "\tChange the options of ZONE to JSONFILE"}},
+   {"show", {true, showZone,
+    "ZONE",
+    "\tShow various details about a zone, including DNSSEC keys"}},
    {"zonemd-verify-file", {true, zonemdVerifyFile,
     "ZONE FILENAME",
     "\tValidate ZONEMD for ZONE"}}}
@@ -438,9 +441,6 @@ static const groupCommandDispatcher zoneDNSSECCommands{
     "ZONE",
     "\tConfigure zone for RFC 9615 DNSSEC bootstrapping\n"
     "\t(zone name must begin with _signal.)"}},
-   {"show", {true, showZone,
-    "ZONE",
-    "\tShow DNSSEC (public) key details about a zone"}},
    {"unset-nsec3", {true, unsetNSec3,
     "ZONE",
     "\tSwitch ZONE back to NSEC"}},
@@ -5476,7 +5476,7 @@ static bool parseCommand(std::vector<std::string>& cmds, std::string& writtencom
     {"set-presigned", {"set-presigned", zoneDNSSECCommands}},
     {"set-publish-cdnskey", {"set-publish-cdnskey", zoneDNSSECCommands}},
     {"set-publish-cds", {"set-publish-cds", zoneDNSSECCommands}},
-    {"show-zone", {"show", zoneDNSSECCommands}},
+    {"show-zone", {"show", zoneMainCommands}},
     {"unpublish-zone-key", {"unpublish-key", zoneKeyCommands}},
     {"unset-nsec3", {"unset-nsec3", zoneDNSSECCommands}},
     {"unset-presigned", {"unset-presigned", zoneDNSSECCommands}},