From 8896fe1cebdc97dcbeb59249f3bb2abd1601b979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20LU=C3=87I?= Date: Mon, 9 Mar 2015 18:52:13 +0100 Subject: [PATCH] Fixes #4446 Correct ipalias removal on top of carp during configuration sync. --- usr/local/www/xmlrpc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index ec6d458d36..82a900c6a4 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");