From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Wed, 21 Apr 2010 10:20:11 +0000 (+0000)
Subject: teach pdnssec not to crash when you do not mention which zone it should sign
X-Git-Tag: rec-3.3~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9175ad60f6132c655fb237981dc559f7a43c38e;p=pdns

teach pdnssec not to crash when you do not mention which zone it should sign


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

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index f85855d04..9352d18b9 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -61,9 +61,9 @@ int main(int argc, char** argv)
       cerr<<"There were ZSKs already for zone '"<<zone<<"': "<<endl;
       
       BOOST_FOREACH(DNSSECKeeper::zskset_t::value_type value, zskset) {
-	cerr<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second<<", "<<value.first.beginValidity<<" - "<<value.first.endValidity<<endl;
-	if(value.second) 
-	  inforce++;
+        cerr<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second<<", "<<value.first.beginValidity<<" - "<<value.first.endValidity<<endl;
+        if(value.second) 
+          inforce++;
       }
     }
       
@@ -85,7 +85,7 @@ int main(int argc, char** argv)
     }
 
   }
-  if(cmds[0] == "show-keys") {
+  else if(cmds[0] == "show-keys") {
     const string& zone=cmds[1];
     DNSSECPrivateKey dpk;
     
@@ -106,13 +106,17 @@ int main(int argc, char** argv)
     else {  
       cerr << "ZSKs for zone '"<<zone<<"':"<<endl;
       BOOST_FOREACH(DNSSECKeeper::zskset_t::value_type value, zskset) {
-	cerr<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second<<", "<< humanTime(value.first.beginValidity)<<" - "<<humanTime(value.first.endValidity)<<endl;
-	if(value.second) 
-	  inforce++;
+        cerr<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second<<", "<< humanTime(value.first.beginValidity)<<" - "<<humanTime(value.first.endValidity)<<endl;
+        if(value.second) 
+        inforce++;
       }
     }
   }
   else if(cmds[0] == "sign-zone") {
+    if(cmds.size() != 2) {
+      cerr << "Error: sign-zone takes exactly 1 parameter"<<endl;
+      return 0;
+    }
     const string& zone=cmds[1];
     DNSSECPrivateKey dpk;