diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2012-05-23 14:25:22 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2012-05-23 15:11:27 -0600 |
| commit | d39a2fc628dfdb0b4cf8a0a3973628fc7047d5ab (patch) | |
| tree | 0a1dab9c9795ef249af607cfba592b75b1b9f272 /etc/inc | |
| parent | fe47f1f2019111dc1743be150f07990e1b501b72 (diff) | |
| download | pfsense-d39a2fc628dfdb0b4cf8a0a3973628fc7047d5ab.zip pfsense-d39a2fc628dfdb0b4cf8a0a3973628fc7047d5ab.tar.gz | |
Check the surrounding characters to not allow partial matches. Ticket #2445
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index ed3fc45..2310e71 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"); |
