diff options
| author | stilez <stilez@users.noreply.github.com> | 2016-01-13 18:38:18 +0000 |
|---|---|---|
| committer | stilez <stilez@users.noreply.github.com> | 2016-01-13 18:38:18 +0000 |
| commit | 9f4a788f41925f24ceaeb9be7d6c82556eded662 (patch) | |
| tree | 1d33c31994a396c80ce9f1cf9b80f404c6de6038 | |
| parent | 9f8266cd08ad4f84ed71e515099720fe3781fdc6 (diff) | |
| download | pfsense-9f4a788f41925f24ceaeb9be7d6c82556eded662.zip pfsense-9f4a788f41925f24ceaeb9be7d6c82556eded662.tar.gz | |
fix $subnet1 should be $subnet2, thanks rbgarba
| -rw-r--r-- | src/etc/inc/util.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index cf15fc8..cce481d 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -862,7 +862,7 @@ function check_subnets_overlap($subnet1, $bits1, $subnet2, $bits2) { function check_subnetsv4_overlap($subnet1, $bits1, $subnet2, $bits2) { $largest_sn = max($bits1, $bits2); $subnetv4_start1 = gen_subnetv4($subnet1, $largest_sn); - $subnetv4_start2 = gen_subnetv4($subnet1, $largest_sn); + $subnetv4_start2 = gen_subnetv4($subnet2, $largest_sn); if($subnetv4_start1 == '' || $subnetv4_start2 == '') { // One or both args is not a valid IPv4 subnet @@ -877,7 +877,7 @@ function check_subnetsv4_overlap($subnet1, $bits1, $subnet2, $bits2) { function check_subnetsv6_overlap($subnet1, $bits1, $subnet2, $bits2) { $largest_sn = max($bits1, $bits2); $subnetv6_start1 = gen_subnetv6($subnet1, $largest_sn); - $subnetv6_start2 = gen_subnetv6($subnet1, $largest_sn); + $subnetv6_start2 = gen_subnetv6($subnet2, $largest_sn); if($subnetv6_start1 == '' || $subnetv6_start2 == '') { // One or both args is not a valid IPv6 subnet |
