Fixes #4446 Correct ipalias removal on top of carp during configuration sync.

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");