From a1e4e2a79fce4c734cf3d8e485531f60da5763e8 Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 13 Feb 2013 22:40:22 +0000 Subject: Two interfaces, carp, ip aliases might be on the same subnet as their parent. What needs to be checked is the ip itself --- usr/local/www/firewall_virtual_ip_edit.php | 2 +- usr/local/www/interfaces.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'usr/local') 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']))) -- cgit v1.1