summaryrefslogtreecommitdiffstats
path: root/etc/inc/upgrade_config.inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-06-28 19:26:41 +0000
committerErmal <eri@pfsense.org>2011-06-28 19:26:41 +0000
commit84924e76c44950387e387af7927f63d5822dfda4 (patch)
tree02abe718f97831714113e9e042b3e9e08e289c7a /etc/inc/upgrade_config.inc
parent3cedb66fdb85d35f49ec1f180a73a2bc7c120c07 (diff)
downloadpfsense-84924e76c44950387e387af7927f63d5822dfda4.zip
pfsense-84924e76c44950387e387af7927f63d5822dfda4.tar.gz
Add proper checks in auth code for testing if the section has been set in the config. Also do the same in the ugprade code
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r--etc/inc/upgrade_config.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 8159638..685cb13 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1341,6 +1341,8 @@ function upgrade_048_to_049() {
$all['gid'] = 1998;
$all['member'] = array();
+ if (!is_array($config['system']['user']))
+ $config['system']['user'] = array();
if (!is_array($config['system']['group']))
$config['system']['group'] = array();
@@ -1392,6 +1394,9 @@ function upgrade_048_to_049() {
function upgrade_049_to_050() {
global $config;
+
+ if (!is_array($config['system']['user']))
+ $config['system']['user'] = array();
/* update user privileges */
foreach ($config['system']['user'] as & $user) {
$privs = array();
@@ -2098,6 +2103,7 @@ function upgrade_055_to_056() {
function upgrade_056_to_057() {
global $config;
+
if (!is_array($config['system']['user']))
$config['system']['user'] = array();
/* migrate captivate portal to user manager */
OpenPOWER on IntegriCloud