From: Edward Dore <5480052+spheron1@users.noreply.github.com>
Date: Thu, 19 Dec 2019 17:48:42 +0000 (+0000)
Subject: Fix trusted-notification-proxy port
X-Git-Tag: auth-4.3.0-beta1~50^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F8650%2Fhead;p=thirdparty%2Fpdns.git

Fix trusted-notification-proxy port

Explicitly set the port for outgoing queries to the SuperMaster when using trusted-notification-proxy and EDNS Client Subnet

Closes #8584
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index f1d4f28738..e0e78992fb 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -786,7 +786,7 @@ int PacketHandler::trySuperMasterSynchronous(const DNSPacket& p, const DNSName&
 {
   ComboAddress remote = p.getRemote().setPort(53);
   if(p.hasEDNSSubnet() && ::arg().contains("trusted-notification-proxy", remote.toString())) {
-    remote = p.getRealRemote().getNetwork();
+    remote = p.getRealRemote().getNetwork().setPort(53);
   }
 
   Resolver::res_t nsset;