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:23 +0100 |
| commit | 8896fe1cebdc97dcbeb59249f3bb2abd1601b979 (patch) | |
| tree | 7d674c2b1dd2786bf334dc9d69853d84b41f741f /usr/local/www/xmlrpc.php | |
| parent | 7926283050154cb3f7c8fdd368096746714e5513 (diff) | |
| download | pfsense-8896fe1cebdc97dcbeb59249f3bb2abd1601b979.zip pfsense-8896fe1cebdc97dcbeb59249f3bb2abd1601b979.tar.gz | |
Fixes #4446 Correct ipalias removal on top of carp during configuration sync.
Diffstat (limited to 'usr/local/www/xmlrpc.php')
| -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 ec6d458..82a900c 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"); |
