summaryrefslogtreecommitdiffstats
path: root/usr/local/www/xmlrpc.php
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-11-28 18:36:03 +0000
committerErmal <eri@pfsense.org>2013-11-28 18:36:18 +0000
commit7238e0cfc840d175e5b0dd650730fc21b6a9b368 (patch)
tree7a3b20dd35ddf6019eb61f612d10711de12c03e4 /usr/local/www/xmlrpc.php
parentd11134243489f7cea17cdc4c04a0624b0c16ed18 (diff)
downloadpfsense-7238e0cfc840d175e5b0dd650730fc21b6a9b368.zip
pfsense-7238e0cfc840d175e5b0dd650730fc21b6a9b368.tar.gz
Remove references to _vip interface and provide proper configuration for carp on FreeBSD 10. Still some places to deal with this and certainly missing upgrade code
Diffstat (limited to 'usr/local/www/xmlrpc.php')
-rwxr-xr-xusr/local/www/xmlrpc.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index e011162..91f05e9 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -269,8 +269,9 @@ function restore_config_section_xmlrpc($raw_params) {
}
/* Cleanup remaining old carps */
foreach ($oldvips as $oldvipif => $oldvippar) {
- if (!is_ipaddr($oldvipif) && does_interface_exist($oldvipif))
- pfSense_interface_destroy($oldvipif);
+ $oldvipif = get_real_interface($oldvippar['interface']);
+ if (!empty($oldvipif))
+ pfSense_interface_deladdress($oldvipif, $oldvipar['subnet']);
}
if ($carp_setuped == true)
interfaces_carp_setup();
OpenPOWER on IntegriCloud