From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 4 May 2018 09:03:17 +0000 (+0200)
Subject: auth-bindbackend: only compare ips in isMaster()
X-Git-Tag: auth-4.1.2~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6570%2Fhead;p=thirdparty%2Fpdns.git

auth-bindbackend: only compare ips in isMaster()
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 86159c424d..3dea35d3af 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -1211,10 +1211,16 @@ bool Bind2Backend::isMaster(const DNSName& name, const string &ip)
   if(bbd.d_kind != DomainInfo::Slave)
     return false;
 
-  for(vector<string>::const_iterator iter = bbd.d_masters.begin(); iter != bbd.d_masters.end(); ++iter)
-    if(*iter==ip)
-      return true;
-  
+  for(vector<string>::const_iterator iter = bbd.d_masters.begin(); iter != bbd.d_masters.end(); ++iter) {
+    try {
+      const ComboAddress caMaster(*iter);
+      if(ip == caMaster.toString()) {
+        return true;
+      }
+    }
+    catch(...) {}
+  }
+
   return false;
 }