oops, the --config-name fix broke setups w/o a config-name

plus add ability to import a key as ksk or zsk

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

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index f219f086a06cccc55872524527f4475b1f86a958..7069fd5318eade208b0e97234496c2356817ed3a 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -183,7 +183,7 @@ try
     ("help,h", "produce help message")
     ("verbose,v", po::value<bool>(), "be verbose")
     ("force", "force an action")
-    ("config-name", po::value<string>(), "virtual configuration name")
+    ("config-name", po::value<string>()->default_value(""), "virtual configuration name")
     ("config-dir", po::value<string>()->default_value(SYSCONFDIR), "location of pdns.conf")
     ("commands", po::value<vector<string> >());
 
@@ -360,7 +360,20 @@ try
     DNSSECPrivateKey dpk;
     getRSAKeyFromISC(&dpk.d_key.getContext(), fname.c_str());
     dpk.d_algorithm = 5;
-    dpk.d_flags = 257;
+    
+    if(cmds.size() > 3) {
+      if(pdns_iequals(cmds[3], "ZSK"))
+        dpk.d_flags = 256;
+      else if(pdns_iequals(cmds[3], "KSK"))
+        dpk.d_flags = 257;
+      else {
+        cerr<<"Unknown key flag '"<<cmds[3]<<"'\n";
+        exit(1);
+      }
+    }
+    else
+      dpk.d_flags = 257; 
+      
     dk.addKey(zone, true, dpk); // add a KSK
   }
   else if(cmds[0]=="export-zone-dnskey") {