diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-03-09 19:01:40 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-03-09 19:01:40 +0100 |
| commit | 6127c541cc84fab64acc6a447905b11517725086 (patch) | |
| tree | ab76a9559c2b8a78d61395436a7004a4bad46b96 /usr/local/www/xmlrpc.php | |
| parent | 8896fe1cebdc97dcbeb59249f3bb2abd1601b979 (diff) | |
| download | pfsense-6127c541cc84fab64acc6a447905b11517725086.zip pfsense-6127c541cc84fab64acc6a447905b11517725086.tar.gz | |
Revert "Fixes #4446 Correct ipalias removal on top of carp during configuration sync."
master works differently and get_real_interface() resolves vips as well.
This reverts commit 8896fe1cebdc97dcbeb59249f3bb2abd1601b979.
Diffstat (limited to 'usr/local/www/xmlrpc.php')
| -rwxr-xr-x | usr/local/www/xmlrpc.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 82a900c..ec6d458 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -280,11 +280,7 @@ function restore_config_section_xmlrpc($raw_params) { } /* Cleanup remaining old carps */ foreach ($oldvips as $oldvipif => $oldvippar) { - if (strstr($oldvippar['interface'], '_vip')) { - $oldvipif = explode('_vip', $oldvippar['interface']); - $oldvipif = $oldvipif[0]; - } else - $oldvipif = get_real_interface($oldvippar['interface']); + $oldvipif = get_real_interface($oldvippar['interface']); if (!empty($oldvipif)) { if (is_ipaddrv6($oldvipif)) mwexec("/sbin/ifconfig " . escapeshellarg($oldvipif) . " inet6 " . escapeshellarg($oldvipar['subnet']) . " delete"); |
