From: bert hubert <bert.hubert@powerdns.com>
Date: Thu, 15 Jun 2017 01:14:01 +0000 (+0200)
Subject: when making a netmask from a comboaddress, we neglected to zero the port. This could... 
X-Git-Tag: auth-4.0.5~1^2~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2465d6dcbb664c532716ec142a8537608d0e04e;p=thirdparty%2Fpdns.git

when making a netmask from a comboaddress, we neglected to zero the port. This could lead to a proliferation of netmasks.

(cherry picked from commit 0bdabe94e6fd873455d34b88f8954d8cc6034a72)
---

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 683d9e9bfb..aa28887c3a 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -314,7 +314,7 @@ public:
   Netmask(const ComboAddress& network, uint8_t bits=0xff)
   {
     d_network = network;
-    
+    d_network.sin4.sin_port=0;
     if(bits > 128)
       bits = (network.sin4.sin_family == AF_INET) ? 32 : 128;