From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 21 Jul 2014 21:17:24 +0000 (+0200)
Subject: remove unused variable from TSIGGrantsAccess()
X-Git-Tag: auth-3.4.0-rc1~43^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d03fee87aa1bd370d77794743789f12b3dd226f;p=thirdparty%2Fpdns.git

remove unused variable from TSIGGrantsAccess()
---

diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index 3ef4206852..1c7c7242f4 100644
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -397,7 +397,7 @@ bool DNSSECKeeper::getPreRRSIGs(DNSBackend& db, const std::string& signer, const
         return true;
 }
 
-bool DNSSECKeeper::TSIGGrantsAccess(const string& zone, const string& keyname, const string& algorithm)
+bool DNSSECKeeper::TSIGGrantsAccess(const string& zone, const string& keyname)
 {
   vector<string> allowed;
   
diff --git a/pdns/dnsseckeeper.hh b/pdns/dnsseckeeper.hh
index da9269a761..1707aef0b8 100644
--- a/pdns/dnsseckeeper.hh
+++ b/pdns/dnsseckeeper.hh
@@ -91,7 +91,7 @@ public:
   bool setPresigned(const std::string& zname);
   bool unsetPresigned(const std::string& zname);
 
-  bool TSIGGrantsAccess(const string& zone, const string& keyname, const string& algorithm);
+  bool TSIGGrantsAccess(const string& zone, const string& keyname);
   bool getTSIGForAccess(const string& zone, const string& master, string* keyname);
   
   void startTransaction()
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 2fad9907f7..4cfefcb2cd 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -400,7 +400,7 @@ bool TCPNameserver::canDoAXFR(shared_ptr<DNSPacket> q)
     
     DNSSECKeeper dk;
     
-    if(!dk.TSIGGrantsAccess(q->qdomain, keyname, trc.d_algoName)) {
+    if(!dk.TSIGGrantsAccess(q->qdomain, keyname)) {
       L<<Logger::Error<<"AXFR '"<<q->qdomain<<"' denied: key with name '"<<keyname<<"' and algorithm '"<<trc.d_algoName<<"' does not grant access to zone"<<endl;
       return false;
     }