From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Tue, 9 Jan 2018 19:07:01 +0000 (+0100)
Subject: resolver: remove pointless optional-local sendResolve overload
X-Git-Tag: dnsdist-1.3.0~151^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a217e643801d41add890f80f3471fc07c0b4f5a;p=pdns

resolver: remove pointless optional-local sendResolve overload
---

diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index 3828cc265..b8c7d4c5a 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -176,16 +176,6 @@ uint16_t Resolver::sendResolve(const ComboAddress& remote, const ComboAddress& l
   return randomid;
 }
 
-uint16_t Resolver::sendResolve(const ComboAddress& remote, const DNSName &domain,
-                               int type, bool dnssecOK,
-                               const DNSName& tsigkeyname, const DNSName& tsigalgorithm,
-                               const string& tsigsecret)
-{
-  ComboAddress local;
-  local.sin4.sin_family = 0;
-  return this->sendResolve(remote, local, domain, type, dnssecOK, tsigkeyname, tsigalgorithm, tsigsecret);
-}
-
 static int parseResult(MOADNSParser& mdp, const DNSName& origQname, uint16_t origQtype, uint16_t id, Resolver::res_t* result)
 {
   result->clear();
diff --git a/pdns/resolver.hh b/pdns/resolver.hh
index e6c6e7ae5..a0ad541d5 100644
--- a/pdns/resolver.hh
+++ b/pdns/resolver.hh
@@ -68,9 +68,6 @@ public:
   uint16_t sendResolve(const ComboAddress& remote, const ComboAddress& local, const DNSName &domain, int type, bool dnssecOk=false,
     const DNSName& tsigkeyname=DNSName(), const DNSName& tsigalgorithm=DNSName(), const string& tsigsecret="");
 
-  uint16_t sendResolve(const ComboAddress& remote, const DNSName &domain, int type, bool dnssecOk=false,
-    const DNSName& tsigkeyname=DNSName(), const DNSName& tsigalgorithm=DNSName(), const string& tsigsecret="");
-
   //! see if we got a SOA response from our sendResolve
   bool tryGetSOASerial(DNSName *theirDomain, uint32_t* theirSerial, uint32_t* theirInception, uint32_t* theirExpire, uint16_t* id);
   
diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index a5793d778..f77799082 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -662,21 +662,12 @@ struct SlaveSenderReceiver
     random_shuffle(dni.di.masters.begin(), dni.di.masters.end());
     try {
       ComboAddress remote(*dni.di.masters.begin());
-      if (dni.localaddr.sin4.sin_family == 0) {
-        return make_pair(dni.di.zone,
-          d_resolver.sendResolve(ComboAddress(*dni.di.masters.begin(), 53),
-            dni.di.zone,
-            QType::SOA,
-            dni.dnssecOk, dni.tsigkeyname, dni.tsigalgname, dni.tsigsecret)
-        );
-      } else {
-        return make_pair(dni.di.zone,
-          d_resolver.sendResolve(ComboAddress(*dni.di.masters.begin(), 53), dni.localaddr,
-            dni.di.zone,
-            QType::SOA,
-            dni.dnssecOk, dni.tsigkeyname, dni.tsigalgname, dni.tsigsecret)
-        );
-      }
+      return make_pair(dni.di.zone,
+        d_resolver.sendResolve(ComboAddress(*dni.di.masters.begin(), 53), dni.localaddr,
+          dni.di.zone,
+          QType::SOA,
+          dni.dnssecOk, dni.tsigkeyname, dni.tsigalgname, dni.tsigsecret)
+      );
     }
     catch(PDNSException& e) {
       throw runtime_error("While attempting to query freshness of '"+dni.di.zone.toLogString()+"': "+e.reason);