summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorsmos <seth.mos@dds.nl>2011-02-24 15:37:37 +0100
committersmos <seth.mos@dds.nl>2011-02-25 10:27:51 +0100
commitbc75a4309a220392306bb4c094a4d212fdb8cf8d (patch)
tree2f211fe56efe13333c401acd23311b7446f54ab8 /etc
parenta09d8bfca70de0dd752f36b7d81071c77864ca05 (diff)
downloadpfsense-bc75a4309a220392306bb4c094a4d212fdb8cf8d.zip
pfsense-bc75a4309a220392306bb4c094a4d212fdb8cf8d.tar.gz
Correct IPsec carp interface upgrade code, off by one
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/upgrade_config.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 792f8d7..d21c685 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -924,7 +924,7 @@ function upgrade_046_to_047() {
/* convert to the new vip[$vhid] name */
if(preg_match("/^carp/", $tunnel['interface'])) {
- $carpid = substr($tunnel['interface'], 5);
+ $carpid = str_replace("carp", "", $tunnel['interface']);
$tunnel['interface'] = "vip" . $config['virtualip']['vip'][$carpid]['vhid'];
}
$ph1ent['interface'] = $tunnel['interface'];
OpenPOWER on IntegriCloud