Remove 'kind' param in DNSBackend::getDomainKeys

It was unused anyway. Closes #4493

diff --git a/docs/markdown/authoritative/backend-remote.md b/docs/markdown/authoritative/backend-remote.md
index 6db1382a1346917ce9923572757ef4dc28f803f9..52970c1b8298a8879b9881ff6b43b5b5219170b6 100644 (file)
--- a/docs/markdown/authoritative/backend-remote.md
+++ b/docs/markdown/authoritative/backend-remote.md
@@ -325,7 +325,7 @@ Retrieves any keys of kind. The id, flags are unsigned integers, and active is b
 #### Example JSON/RPC
 Query:
 ```
-{"method":"getdomainkeys","parameters":{"name":"example.com.","kind":0}}
+{"method":"getdomainkeys","parameters":{"name":"example.com."}}
 ```
 
 Response:

diff --git a/modules/bindbackend/bindbackend2.hh b/modules/bindbackend/bindbackend2.hh
index ec6b0a444d3d610ca449f3b41ddb563d0041deef..c13d75d5570516bacc864b184d89e714ce6afb77 100644 (file)
--- a/modules/bindbackend/bindbackend2.hh
+++ b/modules/bindbackend/bindbackend2.hh
@@ -216,7 +216,7 @@ public:
   virtual bool getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta);
   virtual bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta);
   virtual bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector<std::string>& meta);
-  virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys);
+  virtual bool getDomainKeys(const DNSName& name, std::vector<KeyData>& keys);
   virtual bool removeDomainKey(const DNSName& name, unsigned int id);
   virtual bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id);
   virtual bool activateDomainKey(const DNSName& name, unsigned int id);

diff --git a/modules/bindbackend/binddnssec.cc b/modules/bindbackend/binddnssec.cc
index db3d116df8eb32da32928d5dfe74138d2af3c5ad..47b2a37812115c8350a1d8a0191bfa5ba2989bd1 100644 (file)
--- a/modules/bindbackend/binddnssec.cc
+++ b/modules/bindbackend/binddnssec.cc
@@ -50,7 +50,7 @@ bool Bind2Backend::getDomainMetadata(const DNSName& name, const std::string& kin
 bool Bind2Backend::setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector<std::string>& meta)
 { return false; }
 
-bool Bind2Backend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys)
+bool Bind2Backend::getDomainKeys(const DNSName& name, std::vector<KeyData>& keys)
 { return false; }
 
 bool Bind2Backend::removeDomainKey(const DNSName& name, unsigned int id)
@@ -263,7 +263,7 @@ bool Bind2Backend::setDomainMetadata(const DNSName& name, const std::string& kin
   return true;
 }
 
-bool Bind2Backend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys)
+bool Bind2Backend::getDomainKeys(const DNSName& name, std::vector<KeyData>& keys)
 {
   if(!d_dnssecdb || d_hybrid)
     return false;

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 6cde555427ae805e1ee12842b845613a8939e54d..034bb1fde3f82ea49d85f9053cd6ff0d2893d8e4 100644 (file)
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -796,7 +796,7 @@ bool GeoIPBackend::getDomainMetadata(const DNSName& name, const std::string& kin
   return false;
 }
 
-bool GeoIPBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<DNSBackend::KeyData>& keys) {
+bool GeoIPBackend::getDomainKeys(const DNSName& name, std::vector<DNSBackend::KeyData>& keys) {
   if (!d_dnssec) return false;
   ReadLock rl(&s_state_lock);
   for(GeoIPDomain dom :  s_domains) {

diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh
index 52990770ea013e3569440b392377c091e9672d22..74b2e9bc9132f14891f4c47e13d6fa496be3e691 100644 (file)
--- a/modules/geoipbackend/geoipbackend.hh
+++ b/modules/geoipbackend/geoipbackend.hh
@@ -62,7 +62,7 @@ public:
   virtual bool doesDNSSEC() { return d_dnssec; };
   virtual bool getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta);
   virtual bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta);
-  virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<DNSBackend::KeyData>& keys);
+  virtual bool getDomainKeys(const DNSName& name, std::vector<DNSBackend::KeyData>& keys);
   virtual bool removeDomainKey(const DNSName& name, unsigned int id);
   virtual bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id);
   virtual bool activateDomainKey(const DNSName& name, unsigned int id);

diff --git a/modules/luabackend/dnssec.cc b/modules/luabackend/dnssec.cc
index 86280e9ecd3593c18de3ea59a1a1b50c1aa3c2dd..6f91bc976f6e2cd390d9725d9648662bda958b4f 100644 (file)
--- a/modules/luabackend/dnssec.cc
+++ b/modules/luabackend/dnssec.cc
@@ -363,23 +363,19 @@ bool LUABackend::addDomainKey(const DNSName& name, const KeyData& key, int64_t&
     return ok >= 0;
 }
 
-bool LUABackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys) {
-    //what is kind used for?
-
+bool LUABackend::getDomainKeys(const DNSName& name, std::vector<KeyData>& keys) {
     if(f_lua_getdomainkeys == 0) 
        return false;
 
     if(logging)
-       L << Logger::Info << backend_name << "(getDomainKeys) BEGIN name: '" << name << "' kind: '" << kind << endl;
+       L << Logger::Info << backend_name << "(getDomainKeys) BEGIN name: '" << name << endl;
 
     lua_rawgeti(lua, LUA_REGISTRYINDEX, f_lua_getdomainkeys);
 
     lua_pushstring(lua, name.toString().c_str());
-    lua_pushinteger(lua, kind);
 
-    if(lua_pcall(lua, 2, 1, f_lua_exec_error) != 0) {
+    if(lua_pcall(lua, 1, 1, f_lua_exec_error) != 0) {
         string e = backend_name + lua_tostring(lua, -1);
-        lua_pop(lua, 1);
 
         throw runtime_error(e);
         return false;

diff --git a/modules/luabackend/luabackend.hh b/modules/luabackend/luabackend.hh
index c861558a60fb01543688fdb0caa8673e07db9e5f..6a390591889b13094adf220821b6f15d22e1516e 100644 (file)
--- a/modules/luabackend/luabackend.hh
+++ b/modules/luabackend/luabackend.hh
@@ -93,7 +93,7 @@ public:
     bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta) override;
     bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector<std::string>& meta) override;
 
-    bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys) override ;
+    bool getDomainKeys(const DNSName& name, std::vector<KeyData>& keys) override ;
     bool removeDomainKey(const DNSName& name, unsigned int id) override ;
     bool activateDomainKey(const DNSName& name, unsigned int id) override ;
     bool deactivateDomainKey(const DNSName& name, unsigned int id) override ;

diff --git a/modules/luabackend/test2/pdns-luabackend.lua b/modules/luabackend/test2/pdns-luabackend.lua
index e13563ce0bd778337a62123fe0f075cfe78cecef..8b8f2bb584728db0afe63c8e6c76c8ee3526facc 100644 (file)
--- a/modules/luabackend/test2/pdns-luabackend.lua
+++ b/modules/luabackend/test2/pdns-luabackend.lua
@@ -167,8 +167,8 @@ function getdomainmetadata(name, kind)
 end
 
 
-function getdomainkeys(name, kind)
-       logger(log_debug, "(l_getdomainkeys) name:", name, 'kind', kind)
+function getdomainkeys(name)
+       logger(log_debug, "(l_getdomainkeys) name:", name)
        return keys[name]
 end
 

diff --git a/modules/oraclebackend/oraclebackend.cc b/modules/oraclebackend/oraclebackend.cc
index b3ab9fd8edb2bf882c341de2a7a414d4626dd3c6..dfd855d354397d8d34f383b1047bf222ef66059b 100644 (file)
--- a/modules/oraclebackend/oraclebackend.cc
+++ b/modules/oraclebackend/oraclebackend.cc
@@ -1557,7 +1557,7 @@ OracleBackend::getTSIGKeys(std::vector< struct TSIGKey > &keys)
 }
 
 bool
-OracleBackend::getDomainKeys (const DNSName& name, unsigned int kind, vector<KeyData>& keys)
+OracleBackend::getDomainKeys (const DNSName& name, vector<KeyData>& keys)
 {
   if(!d_dnssecQueries)
     return -1;

diff --git a/modules/oraclebackend/oraclebackend.hh b/modules/oraclebackend/oraclebackend.hh
index f2fcc15d3f8e5ddad7132cb9dd16886ff7f9548b..0c172573619933c679aab53b8cfc44893ccdc727 100644 (file)
--- a/modules/oraclebackend/oraclebackend.hh
+++ b/modules/oraclebackend/oraclebackend.hh
@@ -104,7 +104,7 @@ public:
   bool setTSIGKey(const DNSName& name, const DNSName& algorithm, const string& content);
   bool getTSIGKeys(std::vector< struct TSIGKey > &keys);
 
-  bool getDomainKeys(const DNSName& name, unsigned int kind, vector<KeyData>& keys);
+  bool getDomainKeys(const DNSName& name, vector<KeyData>& keys);
   bool removeDomainKey(const DNSName& name, unsigned int id);
   bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id);
   bool activateDomainKey(const DNSName& name, unsigned int id);

diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index 5f76b4d846ac6d9c70f8ea44640fe154f1cd7122..809bfb15af78a8281b2aea219eb8c21a0060584b 100644 (file)
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -356,15 +356,14 @@ bool RemoteBackend::setDomainMetadata(const DNSName& name, const std::string& ki
 }
 
 
-bool RemoteBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<DNSBackend::KeyData>& keys) {
+bool RemoteBackend::getDomainKeys(const DNSName& name, std::vector<DNSBackend::KeyData>& keys) {
    // no point doing dnssec if it's not supported
    if (d_dnssec == false) return false;
 
    Json query = Json::object{
      { "method", "getDomainKeys" },
      { "parameters", Json::object{
-       { "name", name.toString() },
-       { "kind", static_cast<int>(kind) }
+       { "name", name.toString() }
      }}
    };
 

diff --git a/modules/remotebackend/remotebackend.hh b/modules/remotebackend/remotebackend.hh
index 0cf0f39817d10bded56260f17b511afeddfb5737..1176dff417e728e00ff3a26a2e2951cdae7a7153 100644 (file)
--- a/modules/remotebackend/remotebackend.hh
+++ b/modules/remotebackend/remotebackend.hh
@@ -160,7 +160,7 @@ class RemoteBackend : public DNSBackend
 
   virtual bool getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta);
   virtual bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta);
-  virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<DNSBackend::KeyData>& keys);
+  virtual bool getDomainKeys(const DNSName& name, std::vector<DNSBackend::KeyData>& keys);
   virtual bool getTSIGKey(const DNSName& name, DNSName* algorithm, std::string* content);
   virtual bool getBeforeAndAfterNamesAbsolute(uint32_t id, const string& qname, DNSName& unhashed, string& before, string& after);
   virtual bool setDomainMetadata(const DNSName& name, const string& kind, const std::vector<std::basic_string<char> >& meta);

diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc
index b9ce22de59364ebbc6f5367ce892396195c4173b..2cfd454f3e426e395ee08bd76e230e51b60e7fcf 100644 (file)
--- a/modules/remotebackend/test-remotebackend.cc
+++ b/modules/remotebackend/test-remotebackend.cc
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(test_method_getDomainKeys) {
    std::vector<DNSBackend::KeyData> keys;
    BOOST_TEST_MESSAGE("Testing getDomainKeys method");
    // we expect to get two keys
-   be->getDomainKeys(DNSName("unit.test."),0,keys);
+   be->getDomainKeys(DNSName("unit.test."),keys);
    BOOST_CHECK_EQUAL(keys.size(), 2);
    // in case we got more than 2 keys, which would be unexpected
    // but not fatal

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index da28653d0620ab10cfbca6dd39f20c48dcfd839a..dec7207e41c1de1b866710edaa22456a0adedd9c 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -829,7 +829,7 @@ bool GSQLBackend::getTSIGKeys(std::vector< struct TSIGKey > &keys)
   return keys.empty();
 }
 
-bool GSQLBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys)
+bool GSQLBackend::getDomainKeys(const DNSName& name, std::vector<KeyData>& keys)
 {
   if(!d_dnssecQueries)
     return false;
@@ -840,7 +840,6 @@ bool GSQLBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vec
       execute();
   
     SSqlStatement::row_t row;
-    //  "select id, kind, active, content from domains, cryptokeys where domain_id=domains.id and name='%s'";
     KeyData kd;
     while(d_ListDomainKeysQuery_stmt->hasNextRow()) {
       d_ListDomainKeysQuery_stmt->nextRow(row);

diff --git a/pdns/backends/gsql/gsqlbackend.hh b/pdns/backends/gsql/gsqlbackend.hh
index cfd3ff54208bd19711c0c2e1abe8a926f3ddb66b..4bfb925bc4ce87b7173870120e48cd33abe31aa2 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.hh
+++ b/pdns/backends/gsql/gsqlbackend.hh
@@ -218,7 +218,7 @@ public:
   bool replaceRRSet(uint32_t domain_id, const DNSName& qname, const QType& qt, const vector<DNSResourceRecord>& rrset);
   bool listSubZone(const DNSName &zone, int domain_id);
   bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id);
-  bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys);
+  bool getDomainKeys(const DNSName& name, std::vector<KeyData>& keys);
   bool getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta);
   bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta);
   bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector<std::string>& meta);

diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index 8e16900924977b12a3464c92927d5e033c9c49d1..70849f12d61c266fe8574227e8dab1f5d1ef015b 100644 (file)
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -144,7 +144,7 @@ static bool keyCompareByKindAndID(const DNSSECKeeper::keyset_t::value_type& a, c
 DNSSECPrivateKey DNSSECKeeper::getKeyById(const DNSName& zname, unsigned int id)
 {  
   vector<DNSBackend::KeyData> keys;
-  d_keymetadb->getDomainKeys(zname, 0, keys);
+  d_keymetadb->getDomainKeys(zname, keys);
   for(const DNSBackend::KeyData& kd :  keys) {
     if(kd.id != id) 
       continue;
@@ -422,7 +422,7 @@ DNSSECKeeper::keyset_t DNSSECKeeper::getKeys(const DNSName& zone, bool useCache)
   keyset_t retkeyset;
   vector<DNSBackend::KeyData> dbkeyset;
 
-  d_keymetadb->getDomainKeys(zone, 0, dbkeyset);
+  d_keymetadb->getDomainKeys(zone, dbkeyset);
 
   // Determine the algorithms that have a KSK/ZSK split
   set<uint8_t> algoSEP, algoNoSEP;
@@ -488,7 +488,7 @@ DNSSECKeeper::keyset_t DNSSECKeeper::getKeys(const DNSName& zone, bool useCache)
 bool DNSSECKeeper::checkKeys(const DNSName& zone)
 {
   vector<DNSBackend::KeyData> dbkeyset;
-  d_keymetadb->getDomainKeys(zone, 0, dbkeyset);
+  d_keymetadb->getDomainKeys(zone, dbkeyset);
 
   for(const DNSBackend::KeyData &keydata : dbkeyset) {
     DNSKEYRecordContent dkrc;

diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh
index 2c1adfd07e956e04d8d83cf0b66a035bea028ead..a748383e8b6745fa4c62b0945d2f22ece244c8d5 100644 (file)
--- a/pdns/dnsbackend.hh
+++ b/pdns/dnsbackend.hh
@@ -178,7 +178,7 @@ public:
     bool active;
   };
 
-  virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<KeyData>& keys) { return false;}
+  virtual bool getDomainKeys(const DNSName& name, std::vector<KeyData>& keys) { return false;}
   virtual bool removeDomainKey(const DNSName& name, unsigned int id) { return false; }
   virtual bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id){ return false; }
   virtual bool activateDomainKey(const DNSName& name, unsigned int id) { return false; }

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 15cef6c328979cd843ecc160cc18e6de84c1207a..7640dad222a356d042ddf4ec19a972f2ec9355d8 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -415,7 +415,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect
     }
 
     vector<DNSBackend::KeyData> dbkeyset;
-    B.getDomainKeys(zone, 0, dbkeyset);
+    B.getDomainKeys(zone, dbkeyset);
 
     for(DNSBackend::KeyData& kd : dbkeyset) {
       DNSKEYRecordContent dkrc;
@@ -3075,7 +3075,7 @@ loadMainConfig(g_vm["config-dir"].as<string>());
       dpk.setKey(dke);
 
       // make sure this key isn't being reused.
-      B.getDomainKeys(zone, 0, keys);
+      B.getDomainKeys(zone, keys);
       id = -1;
 
       for(DNSBackend::KeyData& kd :  keys) {
@@ -3117,7 +3117,7 @@ loadMainConfig(g_vm["config-dir"].as<string>());
  
       id = pdns_stou(cmds[3]);
       std::vector<DNSBackend::KeyData> keys; 
-      if (!B.getDomainKeys(zone, 0, keys)) {
+      if (!B.getDomainKeys(zone, keys)) {
         cerr << "No keys found for zone " << zone << std::endl;
         return 1;
       } 
@@ -3231,7 +3231,7 @@ loadMainConfig(g_vm["config-dir"].as<string>());
       // temp var for KeyID
       int64_t keyID;
       std::vector<DNSBackend::KeyData> keys;
-      if (src->getDomainKeys(di.zone, 0, keys)) {
+      if (src->getDomainKeys(di.zone, keys)) {
         for(const DNSBackend::KeyData& k: keys) {
           tgt->addDomainKey(di.zone, k, keyID);
           nk++;

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index edb1e42ea1c829033571d820253d21ce7dce07b7..6fbd999fe7cad72cbee95c7753a074906b79c3fa 100644 (file)
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -106,10 +106,10 @@ bool UeberBackend::addDomainKey(const DNSName& name, const DNSBackend::KeyData&
   }
   return false;
 }
-bool UeberBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector<DNSBackend::KeyData>& keys)
+bool UeberBackend::getDomainKeys(const DNSName& name, std::vector<DNSBackend::KeyData>& keys)
 {
   for(DNSBackend* db :  backends) {
-    if(db->getDomainKeys(name, kind, keys))
+    if(db->getDomainKeys(name, keys))
       return true;
   }
   return false;

diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index acecf9c8d6b04a161e156ca32e3df9565e5b5f90..8d615ac30b1a173a507df2bacb675264a9335ff5 100644 (file)
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -115,7 +115,7 @@ public:
   bool createDomain(const DNSName &domain);
   
   bool addDomainKey(const DNSName& name, const DNSBackend::KeyData& key, int64_t& id);
-  bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector<DNSBackend::KeyData>& keys);
+  bool getDomainKeys(const DNSName& name, std::vector<DNSBackend::KeyData>& keys);
   bool getAllDomainMetadata(const DNSName& name, std::map<std::string, std::vector<std::string> >& meta);
   bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector<std::string>& meta);
   bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector<std::string>& meta);