From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 14 Jan 2013 14:19:31 +0000 (+0000)
Subject: revert bogus r3049
X-Git-Tag: auth-3.2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=151b561fdc3dde0c992758d837583ca46c63056e;p=pdns

revert bogus r3049

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3050 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 86a7c17b3..5329084f6 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -745,29 +745,30 @@ try
   if(cmds.empty() || g_vm.count("help")) {
     cerr<<"Usage: \npdnssec [options] <command> [params ..]\n\n";
     cerr<<"Commands:\n";
-    cerr<<"activate-zone-key ZONE KEY-ID        Activate the key with key id KEY-ID in ZONE\n";
+    cerr<<"activate-zone-key ZONE KEY-ID      Activate the key with key id KEY-ID in ZONE\n";
     cerr<<"add-zone-key ZONE zsk|ksk [bits]\n";
-    cerr<<"             [rsasha1|rsasha256|rsasha512|gost|e  cdsa256|ecdsa384]\n";
-    cerr<<"                                     Add a ZSK or KSK to zone and specif  y algo&bits\n";
-    cerr<<"check-zone ZONE                      Check a zone for correctness\n";
-    cerr<<"check-all-zones                      Check all zones for correctness\n";
-    cerr<<"create-bind-db FNAME                 Create DNSSEC db for BIND backend (bind-dnssec-db)\n"; 
-    cerr<<"deactivate-zone-key ZONE KEY-ID      Deactivate the key with key id KEY-ID in ZONE\n";
-    cerr<<"disable-dnssec ZONE                  Deactivate all keys and unset PRESIGNED in ZONE\n";
-    cerr<<"export-zone-dnskey ZONE KEY-ID       Export to stdout the public DNSKEY described\n";
-    cerr<<"export-zone-key ZONE KEY-ID          Export to stdout the private key described\n";
-    cerr<<"hash-zone-record ZONE RNAME          Calculate the NSEC3 hash for RNAME in ZONE\n";
-    cerr<<"import-zone-key ZONE FILE <ksk|zsk>  Import from a file a private key, ZSK or KSK\n";            
-    cerr<<"rectify-zone ZONE [ZONE ..]          Fix up DNSSEC fields (order, auth)\n";
-    cerr<<"rectify-all-zones                    Rectify all zones.\n";
-    cerr<<"remove-zone-key ZONE KEY-ID          Remove key with KEY-ID from ZONE\n";
-    cerr<<"secure-zone ZONE [ZONE ..]           Add KSK and two ZSKs\n";
-    cerr<<"set-nsec3 ZONE ['params' [<narrow>]] Enable NSEC3 with PARAMs. Opt. narrow\n";
-    cerr<<"set-presigned ZONE                   Use presigned RRSIGs from storage\n";
-    cerr<<"show-zone ZONE                       Show DNSSEC (public) key details about a zone\n";
-    cerr<<"unset-nsec3 ZONE                     Switch back to NSEC\n";
-    cerr<<"unset-presigned ZONE                 No longer use presigned RRSIGs\n";
-    cerr<<"test-schema ZONE                     Test DB schema - will create ZONE\n\n";
+    cerr<<"             [rsasha1|rsasha256|rsasha512|gost|ecdsa256|ecdsa384]\n";
+    cerr<<"                                   Add a ZSK or KSK to zone and specify algo&bits\n";
+    cerr<<"check-zone ZONE                    Check a zone for correctness\n";
+    cerr<<"check-all-zones                    Check all zones for correctness\n";
+    cerr<<"create-bind-db FNAME               Create DNSSEC db for BIND backend (bind-dnssec-db)\n"; 
+    cerr<<"deactivate-zone-key ZONE KEY-ID    Deactivate the key with key id KEY-ID in ZONE\n";
+    cerr<<"disable-dnssec ZONE                Deactivate all keys and unset PRESIGNED in ZONE\n";
+    cerr<<"export-zone-dnskey ZONE KEY-ID     Export to stdout the public DNSKEY described\n";
+    cerr<<"export-zone-key ZONE KEY-ID        Export to stdout the private key described\n";
+    cerr<<"hash-zone-record ZONE RNAME        Calculate the NSEC3 hash for RNAME in ZONE\n";
+    cerr<<"import-zone-key ZONE FILE          Import from a file a private key, ZSK or KSK\n";            
+    cerr<<"                [ksk|zsk]          Defaults to KSK\n";
+    cerr<<"rectify-zone ZONE [ZONE ..]        Fix up DNSSEC fields (order, auth)\n";
+    cerr<<"rectify-all-zones                  Rectify all zones.\n";
+    cerr<<"remove-zone-key ZONE KEY-ID        Remove key with KEY-ID from ZONE\n";
+    cerr<<"secure-zone ZONE [ZONE ..]         Add KSK and two ZSKs\n";
+    cerr<<"set-nsec3 ZONE ['params' [narrow]] Enable NSEC3 with PARAMs. Optionally narrow\n";
+    cerr<<"set-presigned ZONE                 Use presigned RRSIGs from storage\n";
+    cerr<<"show-zone ZONE                     Show DNSSEC (public) key details about a zone\n";
+    cerr<<"unset-nsec3 ZONE                   Switch back to NSEC\n";
+    cerr<<"unset-presigned ZONE               No longer use presigned RRSIGs\n";
+    cerr<<"test-schema ZONE                   Test DB schema - will create ZONE\n\n";
     cerr<<desc<<endl;
     return 0;
   }
@@ -1080,7 +1081,7 @@ try
   }  
   else if(cmds[0]=="import-zone-key-pem") {
     if(cmds.size() < 4) {
-      cerr<<"Syntax: pdnssec import-zone-key ZONE FILE algorithm <ksk|zsk>"<<endl;
+      cerr<<"Syntax: pdnssec import-zone-key ZONE FILE algorithm [zsk|ksk]"<<endl;
       exit(1);
     }
     string zone=cmds[1];