From d39a2fc628dfdb0b4cf8a0a3973628fc7047d5ab Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Wed, 23 May 2012 14:25:22 -0600
Subject: [PATCH] Check the surrounding characters to not allow partial
 matches. Ticket #2445

---
 etc/inc/upgrade_config.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index ed3fc45aa6..2310e71ffc 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2799,7 +2799,7 @@ function upgrade_085_to_086() {
 		foreach ($config['virtualips']['vip'] as $vip) {
 			if ($vip['mode'] != "carp")
 				continue;
-			file_put_contents("{$g['tmp_path']}/vipreplace", "s/vip{$vip['vhid']}/{$vip['interface']}_vip{$vip['vhid']}/g\n");
+			file_put_contents("{$g['tmp_path']}/vipreplace", "s/\\([^_]\\)vip{$vip['vhid']}\\([^0-9]\\)/\\1{$vip['interface']}_vip{$vip['vhid']}\\2/g\n");
 		}
 		mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml");
 		require_once("config.lib.inc");