summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-09-11 14:32:36 -0400
committerjim-p <jimp@pfsense.org>2013-09-11 14:33:17 -0400
commit611f2910bd5b4c58f03eeae65f16aedba5db95d6 (patch)
treee43cd22f147d55ad7c698d7923cdd780c6b312cb /usr/local/www
parenteed5b5076408c8e8bdde52585aaf09b33b3a1825 (diff)
downloadpfsense-611f2910bd5b4c58f03eeae65f16aedba5db95d6.zip
pfsense-611f2910bd5b4c58f03eeae65f16aedba5db95d6.tar.gz
Make sure to account for IP aliases on lo0 here, or they get duplicated on each CARP sync
Diffstat (limited to 'usr/local/www')
-rwxr-xr-xusr/local/www/xmlrpc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 7c0d519..e011162 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -202,9 +202,9 @@ function restore_config_section_xmlrpc($raw_params) {
foreach ($config['virtualip']['vip'] as $vipindex => $vip) {
if ($vip['mode'] == "carp")
$oldvips["{$vip['interface']}_vip{$vip['vhid']}"] = "{$vip['password']}{$vip['advskew']}{$vip['subnet']}{$vip['subnet_bits']}{$vip['advbase']}";
- else if ($vip['mode'] == "ipalias" && strstr($vip['interface'], "_vip"))
+ else if ($vip['mode'] == "ipalias" && (strstr($vip['interface'], "_vip") || strstr($vip['interface'], "lo0")))
$oldvips[$vip['subnet']] = "{$vip['interface']}{$vip['subnet']}{$vip['subnet_bits']}";
- else if (($vip['mode'] == "ipalias" || $vip['mode'] == 'proxyarp') && !strstr($vip['interface'], "_vip"))
+ else if (($vip['mode'] == "ipalias" || $vip['mode'] == 'proxyarp') && !(strstr($vip['interface'], "_vip") || strstr($vip['interface'], "lo0")))
$vipbackup[] = $vip;
}
}
OpenPOWER on IntegriCloud