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

Conflicts:
	usr/local/www/xmlrpc.php

1 files changed, 6 insertions, 2 deletions

diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index ec6d458..13e98ff 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -279,8 +279,12 @@ function restore_config_section_xmlrpc($raw_params) {
 			}
 		}
 		/* Cleanup remaining old carps */
-		foreach ($oldvips as $oldvipif => $oldvippar) {
-			$oldvipif = get_real_interface($oldvippar['interface']);
+		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']);
 			if (!empty($oldvipif)) {
 				if (is_ipaddrv6($oldvipif))
 					 mwexec("/sbin/ifconfig " . escapeshellarg($oldvipif) . " inet6 " . escapeshellarg($oldvipar['subnet']) . " delete");