From a9127abc7ca61356bac95472e8fb8a2a1b69d265 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 19 Oct 2023 16:53:23 +0200
Subject: [PATCH] simplify address comparison, remove debug messages

---
 pdns/ixfrdist.cc | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index 82061d5773..ca7d18c096 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -508,22 +508,13 @@ static ResponseType maybeHandleNotify(const MOADNSParser& mdp, const ComboAddres
 
   bool masterFound = false;
 
-  auto saddrPort0 = saddr;
-  saddrPort0.setPort(0);
-
   for(const auto &master : masters) {
-    auto masterPort0 = master;
-    masterPort0.setPort(0);
-    cerr<<masterPort0.toStringWithPort()<<"=="<<saddrPort0.toStringWithPort()<<endl;
-    if (masterPort0 == saddrPort0) {
+    if (ComboAddress::addressOnlyEqual()(saddr, master)) {
       masterFound = true;
-      cerr<<"found"<<endl;
       break;
     }
   }
 
-  cerr<<"masterFound="<<masterFound<<endl;
-
   if (masterFound) {
     g_notifiesReceived.lock()->insert(mdp.d_qname);
     return ResponseType::EmptyNoError;
-- 
2.47.2