diff options
author | Ermal LUÇI <eri@pfsense.org> | 2015-03-09 18:52:13 +0100 |
---|---|---|
committer | Ermal LUÇI <eri@pfsense.org> | 2015-03-09 18:52:13 +0100 |
commit | 457d9c3275ff2b7ad691a38bdcb72e7177ff159a (patch) | |
tree | 0ea3854747361148a664550cfaa8ed5969061382 /usr/local/www | |
parent | 36dbc14aaaeac08051e22dbc8c2f4ef330adb054 (diff) | |
download | pfsense-457d9c3275ff2b7ad691a38bdcb72e7177ff159a.zip pfsense-457d9c3275ff2b7ad691a38bdcb72e7177ff159a.tar.gz |
Fixes #4446 Correct ipalias removal on top of carp during configuration sync.
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/xmlrpc.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 2f2d944..e84326f 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -280,7 +280,11 @@ function restore_config_section_xmlrpc($raw_params) { } /* Cleanup remaining old carps */ foreach ($oldvips as $oldvipif => $oldvippar) { - $oldvipif = get_real_interface($oldvippar['interface']); + if (strstr($oldvippar['interface'], '_vip')) { + $oldvipif = explode('_vip', $oldvippar['interface']); + $oldvipif = $oldvipif[0]; + } else + $oldvipif = get_real_interface($oldvippar['interface']); if (!empty($oldvipif)) { if (is_ipaddrv6($oldvipif)) mwexec("/sbin/ifconfig " . escapeshellarg($oldvipif) . " inet6 " . escapeshellarg($oldvipar['subnet']) . " delete"); |