From c18ba6bf278c96c3016f92681544e8ccbae79670 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Fri, 18 Dec 2015 12:23:26 +0545
Subject: Fix gen_subnetv4_max

and use it in services_dhcp rather than trying to do the similar
calculation in-line.
Should fix redmine #5654 and probably a bunch of other things that use
gen_subnet_max
---
 src/etc/inc/util.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/etc/inc/util.inc')

diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index 821855f..be6a5e9 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -392,7 +392,7 @@ function gen_subnetv4_max($ipaddr, $bits) {
 		if ($bits == 32) {
 			return $ipaddr;
 		}
-		return long2ip32(ip2long($ipaddr) | ~gen_subnet_mask_long($bits));
+		return long2ip32(ip2long($ipaddr) | (~gen_subnet_mask_long($bits) & 0xFFFFFFFF));
 	}
 	return "";
 }
-- 
cgit v1.1