From 07bf35d15523262cb7785c433e80627bf9abd27f Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 24 May 2013 14:12:55 +0200
Subject: [PATCH] catch a lot more errors in pdnssec and report them. Fixes
 #588. Fixing #588.

---
 pdns/pdnssec.cc | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 1b7cf5e6d..78cac42f5 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -785,7 +785,7 @@ bool secureZone(DNSSECKeeper& dk, const std::string& zone)
   }
   
   for(vector<string>::iterator i = k_algos.begin()+1; i != k_algos.end(); i++)
-     dk.addKey(zone, true, shorthand2algorithm(*i), k_size, true);
+    dk.addKey(zone, true, shorthand2algorithm(*i), k_size, true); // obvious errors will have been caught above
 
   BOOST_FOREACH(string z_algo, z_algos)
   {
@@ -1147,13 +1147,18 @@ try
         bits = atoi(cmds[n].c_str());
       } else { 
         cerr<<"Unknown algorithm, key flag or size '"<<cmds[n]<<"'"<<endl;
-        return 0;
+        exit(EXIT_FAILURE);;
       }
     }
-    cerr<<"Adding a " << (keyOrZone ? "KSK" : "ZSK")<<" with algorithm = "<<algorithm<<", active="<<active<<endl;
-    if(bits)
-      cerr<<"Requesting specific key size of "<<bits<<" bits"<<endl;
-    dk.addKey(zone, keyOrZone, algorithm, bits, active); 
+    if(!dk.addKey(zone, keyOrZone, algorithm, bits, active)) {
+      cerr<<"Adding key failed, perhaps DNSSEC not enabled in configuration?"<<endl;
+      exit(1);
+    }
+    else {
+      cerr<<"Added a " << (keyOrZone ? "KSK" : "ZSK")<<" with algorithm = "<<algorithm<<", active="<<active<<endl;
+      if(bits)
+	cerr<<"Requested specific key size of "<<bits<<" bits"<<endl;
+    }
   }
   else if(cmds[0] == "remove-zone-key") {
     if(cmds.size() < 3) {
@@ -1317,7 +1322,10 @@ try
     else
       dpk.d_flags = 257; // ksk
       
-    dk.addKey(zone, dpk); 
+    if(!dk.addKey(zone, dpk)) {
+      cerr<<"Adding key failed, perhaps DNSSEC not enabled in configuration?"<<endl;
+      exit(1);
+    }
     
   }
   else if(cmds[0]=="import-zone-key") {
@@ -1353,7 +1361,10 @@ try
 	exit(1);
       }	  
     }
-    dk.addKey(zone, dpk, active); 
+    if(!dk.addKey(zone, dpk, active)) {
+      cerr<<"Adding key failed, perhaps DNSSEC not enabled in configuration?"<<endl;
+      exit(1);
+    }
   }
   else if(cmds[0]=="export-zone-dnskey") {
     if(cmds.size() < 3) {
-- 
2.50.1