diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-27 14:06:33 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-27 14:06:33 -0400 |
| commit | 8a385f42742b9f1da57f53639436f7bea0c5ada1 (patch) | |
| tree | 942e8ad24b27423f5ccc418fb3be4721f954f9b2 /etc/inc/upgrade_config.inc | |
| parent | 84296ca3f75378ae027cd2030d41cc41d68fc901 (diff) | |
| parent | 2f3554bba15ceabca965aabb6c9cc3b4e33e88d4 (diff) | |
| download | pfsense-8a385f42742b9f1da57f53639436f7bea0c5ada1.zip pfsense-8a385f42742b9f1da57f53639436f7bea0c5ada1.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc/upgrade_config.inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 0b59ce2..0fa3b37 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -897,6 +897,8 @@ function upgrade_045_to_046() { } /* Convert sitedown entries to pools and re-attach */ for ($i = 0; isset($vs_a[$i]); $i++) { + /* Set mode while we're here. */ + $vs_a[$i]['mode'] = "redirect_mode"; if (isset($vs_a[$i]['sitedown'])) { $pool = array(); $pool['type'] = 'server'; @@ -1602,7 +1604,7 @@ function upgrade_051_to_052() { $assigned = true; continue; } else if (substr($tmpstr, 0, 5) == "local") { - $localip = substr($tmpstr, 6); + $localip = substr($tmpstr, 5); $server['ipaddr'] = str_replace("\n", "", $localip); } else $cstmopts[] = $tmpcstmopt; @@ -1704,7 +1706,7 @@ function upgrade_051_to_052() { $assigned = true; continue; } else if (substr($tmpstr, 0, 5) == "local") { - $localip = substr($tmpstr, 6); + $localip = substr($tmpstr, 5); $client['ipaddr'] = str_replace("\n", "", $localip); } else $cstmopts[] = $tmpcstmopt; |
