Cleanup dbdnsseckeeper

diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index b2e201565610d663f7b4c5f3ba7b8bdfaedb4e28..86b41c4a18d6057623f726ad11932125158f171d 100644 (file)
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -682,7 +682,7 @@ bool DNSSECKeeper::getTSIGForAccess(const DNSName& zone, const ComboAddress& /*
   return false;
 }
 
-bool DNSSECKeeper::unSecureZone(const DNSName& zone, string& error, string& /* info */) {
+bool DNSSECKeeper::unSecureZone(const DNSName& zone, string& error) {
   // Not calling isSecuredZone(), as it will return false for zones with zero
   // active keys.
   DNSSECKeeper::keyset_t keyset=getKeys(zone);

diff --git a/pdns/dnsseckeeper.hh b/pdns/dnsseckeeper.hh
index ccad4c98385b3b7873a14727385790b5d2431e0e..10503d53456d25d5e6b0cfed45e5ef2592aec509 100644 (file)
--- a/pdns/dnsseckeeper.hh
+++ b/pdns/dnsseckeeper.hh
@@ -235,7 +235,7 @@ public:
   void getFromMetaOrDefault(const DNSName& zname, const std::string& key, std::string& value, const std::string& defaultvalue);
   bool getFromMeta(const DNSName& zname, const std::string& key, std::string& value);
   void getSoaEdit(const DNSName& zname, std::string& value, bool useCache=true);
-  bool unSecureZone(const DNSName& zone, std::string& error, std::string& info);
+  bool unSecureZone(const DNSName& zone, std::string& error);
   bool rectifyZone(const DNSName& zone, std::string& error, std::string& info, bool doTransaction);
 
   static void setMaxEntries(size_t maxEntries);

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 522352a8bef81cef0a32aaeca347e8f0ed2c1af7..1db2c559f354a537828e4077493d9237c9f4f941 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -1881,7 +1881,7 @@ static bool disableDNSSECOnZone(DNSSECKeeper& dk, const DNSName& zone)
   }
 
   string error, info;
-  bool ret = dk.unSecureZone(zone, error, info);
+  bool ret = dk.unSecureZone(zone, error);
   if (!ret) {
     cerr << error << endl;
   }

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 11bfc38f37f9cea3f0099c1f6c3f24b27c5f4092..5b4b87ec1efbf5ae5add660a00079831dfa46c92 100644 (file)
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -752,7 +752,7 @@ static void updateDomainSettingsFromDocument(UeberBackend& B, const DomainInfo&
       // "dnssec": false in json
       if (isDNSSECZone) {
         string info, error;
-        if (!dk.unSecureZone(zonename, error, info)) {
+        if (!dk.unSecureZone(zonename, error)) {
           throw ApiException("Error while un-securing zone '"+ zonename.toString()+"': " + error);
         }
         isDNSSECZone = dk.isSecuredZone(zonename, false);