summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-02-13 22:40:22 +0000
committerErmal <eri@pfsense.org>2013-02-13 22:40:22 +0000
commita1e4e2a79fce4c734cf3d8e485531f60da5763e8 (patch)
tree4726208cfc520ee50772f7d8d593c482bb0e865b /usr/local
parent72f25519a9ee36cd9c0ba33a3b8736ef0fb7ae26 (diff)
downloadpfsense-a1e4e2a79fce4c734cf3d8e485531f60da5763e8.zip
pfsense-a1e4e2a79fce4c734cf3d8e485531f60da5763e8.tar.gz
Two interfaces, carp, ip aliases might be on the same subnet as their parent. What needs to be checked is the ip itself
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/firewall_virtual_ip_edit.php2
-rwxr-xr-xusr/local/www/interfaces.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index d28d55c..6cd6cb8 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -113,7 +113,7 @@ if ($_POST) {
if ($_POST['subnet']) {
if (!is_ipaddr($_POST['subnet']))
$input_errors[] = gettext("A valid IP address must be specified.");
- else if (is_ipaddr_configured($_POST['subnet'], "vip_" . $id, true))
+ else if (is_ipaddr_configured($_POST['subnet'], "vip_" . $id))
$input_errors[] = gettext("This IPv4 address is being used by another interface or VIP.");
}
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index fcd7b51..5062b36 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -547,7 +547,7 @@ if ($_POST['apply']) {
if ($_POST['ipaddr']) {
if (!is_ipaddrv4($_POST['ipaddr']))
$input_errors[] = gettext("A valid IPv4 address must be specified.");
- else if (is_ipaddr_configured($_POST['ipaddr'], $if, true, true))
+ else if (is_ipaddr_configured($_POST['ipaddr'], $if, true))
$input_errors[] = gettext("This IPv4 address is being used by another interface or VIP.");
}
if (($_POST['ipaddrv6'] && !is_ipaddrv6($_POST['ipaddrv6'])))
OpenPOWER on IntegriCloud