summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/util.inc
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-12-18 12:23:26 +0545
committerPhil Davis <phil.davis@inf.org>2015-12-18 12:23:26 +0545
commitc18ba6bf278c96c3016f92681544e8ccbae79670 (patch)
tree43397320f9a3ff001aff2bfda4f2f458c73565aa /src/etc/inc/util.inc
parentbdabc817f21adb31e6f512fe59f7676997eaee8d (diff)
downloadpfsense-c18ba6bf278c96c3016f92681544e8ccbae79670.zip
pfsense-c18ba6bf278c96c3016f92681544e8ccbae79670.tar.gz
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
Diffstat (limited to 'src/etc/inc/util.inc')
-rw-r--r--src/etc/inc/util.inc2
1 files changed, 1 insertions, 1 deletions
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 "";
}
OpenPOWER on IntegriCloud