summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-04-21 13:10:32 -0400
committerjim-p <jimp@pfsense.org>2011-04-21 13:10:32 -0400
commit1f0c76cfd7086aa90ea97a9775f2f024390a02ec (patch)
tree5538854631010be1e90950188bd4ab2b64c37847 /etc
parent46698c3f3c5e3f2e98829757616ddda3ce779b6d (diff)
downloadpfsense-1f0c76cfd7086aa90ea97a9775f2f024390a02ec.zip
pfsense-1f0c76cfd7086aa90ea97a9775f2f024390a02ec.tar.gz
Fix PPPoE upgrade, the <pppoe> tag is considered an array these days and the upgrade code wasn't treating it properly, accessing it directly instead of using the first entry ([0]). Fixes #1439 - PPPoE credentials upgrade properly now.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/upgrade_config.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 805bbcc..96810ae 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1262,13 +1262,13 @@ function upgrade_047_to_048() {
unset($config['dnsupdate']);
}
- if (is_array($config['pppoe'])) {
+ if (is_array($config['pppoe']) && is_array($config['pppoe'][0])) {
$pconfig = array();
- $pconfig['username'] = $config['pppoe']['username'];
- $pconfig['password'] = $config['pppoe']['password'];
- $pconfig['provider'] = $config['pppoe']['provider'];
- $pconfig['ondemand'] = isset($config['pppoe']['ondemand']);
- $pconfig['timeout'] = $config['pppoe']['timeout'];
+ $pconfig['username'] = $config['pppoe'][0]['username'];
+ $pconfig['password'] = $config['pppoe'][0]['password'];
+ $pconfig['provider'] = $config['pppoe'][0]['provider'];
+ $pconfig['ondemand'] = isset($config['pppoe'][0]['ondemand']);
+ $pconfig['timeout'] = $config['pppoe'][0]['timeout'];
unset($config['pppoe']);
$config['interfaces']['wan']['pppoe_username'] = $pconfig['username'];
$config['interfaces']['wan']['pppoe_password'] = $pconfig['password'];
OpenPOWER on IntegriCloud