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: rec-4.0.6^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b91dc6e92f013d2e0490e3234a415dbe85604b84;p=pdns

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 db2f0bd71..9a2414fc1 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -313,7 +313,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;