iputils.hh: Netmask: Prevent the construction of a 128-bit IPv4 netmask.

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 2c453071f610e4663a2eb0366c38374505b9eb4b..f3537e042ff43294d4ab7eb277bb044b3280b84a 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -423,10 +423,8 @@ 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;
+    d_bits = (network.isIPv4() ? std::min(bits, (uint8_t)32) : std::min(bits, (uint8_t)128));
 
-    d_bits = bits;
     if(d_bits<32)
       d_mask=~(0xFFFFFFFF>>d_bits);
     else