Revert "Use a consistent variable name here. related to Ticket #4446"

This reverts commit 309162b96d.
This commit is contained in:
Renato Botelho 2015-03-11 14:59:42 -03:00
parent 24dadbee06
commit 04bbb3a588

View File

@ -279,12 +279,8 @@ function restore_config_section_xmlrpc($raw_params) {
}
}
/* Cleanup remaining old carps */
foreach ($oldvips as $oldvipif => $oldvipar) {
if (strstr($oldvipar['interface'], '_vip')) {
$oldvipif = explode('_vip', $oldvipar['interface']);
$oldvipif = $oldvipif[0];
} else
$oldvipif = get_real_interface($oldvipar['interface']);
foreach ($oldvips as $oldvipif => $oldvippar) {
$oldvipif = get_real_interface($oldvippar['interface']);
if (!empty($oldvipif)) {
if (is_ipaddrv6($oldvipif))
mwexec("/sbin/ifconfig " . escapeshellarg($oldvipif) . " inet6 " . escapeshellarg($oldvipar['subnet']) . " delete");