Changeset 1824

Timestamp:

01/06/11 22:14:41 (2 years ago)

Author:

ahu

Message:

make importing keys a bit more resilient against whitespace, plus fix up setting the flag on import

Location:

trunk/pdns/pdns

Files:

• dnssecinfra.cc (modified) (2 diffs)
• pdnssec.cc (modified) (1 diff)

trunk/pdns/pdns/dnssecinfra.cc

@@ -91 +91 @@
     tie(key,value)=splitField(sline, ':');
     trim(value);
-
+    trim(key);
+    if(key.empty())
+      continue;
     if(places.count(key)) {
       if(places[key]) {
@@ -111 +113 @@
     else {
       if(key != "Private-key-format" && key != "Algorithm") 
-        cerr<<"Unknown field '"<<key<<"'\n";
+        cerr<<"Unknown field '"<<key<<"'\n";
     }
   }

trunk/pdns/pdns/pdnssec.cc

@@ -352 +352 @@
   }  
   else if(cmds[0]=="import-zone-key") {
-    if(cmds.size()!=3) {
+    if(cmds.size() < 3) {
       cerr<<"Syntax: pdnssec import-zone-key zone-name filename"<<endl;
       exit(1);