Changeset 2453 for trunk/pdns/pdns/pdnssec.cc

Timestamp:

03/04/12 14:47:30 (15 months ago)

Author:

ahu

Message:

pdnssec create-bind-db would only create such a database.. if you already had one. And the one it made for you, was incomplete. Must be Sunday.

Files:

• trunk/pdns/pdns/pdnssec.cc (modified) (2 diffs)

trunk/pdns/pdns/pdnssec.cc

@@ -435 +435 @@
     cerr<<"                                 Add a ZSK or KSK to zone and specify algo&bits\n";
     cerr<<"check-zone ZONE                  Check a zone for correctness\n";
-    cerr<<"create-bind-db [FNAME]           Create a DNSSEC database for BIND backend\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";
@@ -463 +463 @@
   loadMainConfig(g_vm["config-dir"].as<string>());
   reportAllTypes();
+  
+  
+  if(cmds[0] == "create-bind-db") {
+    if(cmds.size() != 2) {
+      cerr << "Syntax: pdnssec create-bind-db fname"<<endl;
+      return 0;
+    }
+    Bind2Backend::createDNSSECDB(cmds[1]);
+    return 1;
+  }
+  
   DNSSECKeeper dk;
 
-  if(cmds[0] == "create-bind-db") {
-    Bind2Backend b2b;
-    b2b.createDNSSECDB(cmds.size() > 1 ? cmds[1] : "");
-  }
-  else if(cmds[0] == "rectify-zone") {
+  if(cmds[0] == "rectify-zone") {
     if(cmds.size() < 2) {
       cerr << "Syntax: pdnssec rectify-zone ZONE [ZONE..]"<<endl;