From 69ad2a3fc19ea23fd6facb7986c8b3d59d95667c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 16 Jan 2016 12:00:24 +0100 Subject: [PATCH] globals: thin out a bit more --- src/etc/inc/config.lib.inc | 5 ++++- src/etc/inc/globals.inc | 4 ---- src/etc/inc/upgrade_config.inc | 4 ++-- src/etc/rc.initial.reboot | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 1aa8a2d87..7677f3008 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -1,7 +1,7 @@ + Copyright (C) 2015-2016 Franco Fichtner Ported from config.inc by Erik Kristensen Copyright (C) 2004-2010 Scott Ullrich Copyright (C) 2003-2004 Manuel Kasper . @@ -29,6 +29,9 @@ POSSIBILITY OF SUCH DAMAGE. */ +openlog('opnsense', LOG_ODELAY, LOG_USER); +register_shutdown_function('closelog'); + require_once("globals.inc"); require_once("xmlparse.inc"); require_once("crypt.inc"); diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index b806da1f1..3ff8c180e 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -29,15 +29,11 @@ global $g; -openlog('opnsense', LOG_ODELAY, LOG_USER); -register_shutdown_function('closelog'); - $g = array( "factory_shipped_username" => "root", "factory_shipped_password" => "opnsense", "dhcpd_chroot_path" => "/var/dhcpd", "unbound_chroot_path" => "/var/unbound", - "admin_group" => "admins", "product_name" => "OPNsense", "product_website" => "https://opnsense.org", "product_email" => "project@opnsense.org", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 2e8512d10..3567b114c 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -1369,7 +1369,7 @@ function upgrade_048_to_049() { /* work around broken gid assignments */ $config['system']['nextgid'] = 2000; foreach ($config['system']['group'] as & $group) { - if ($group['name'] == $g['admin_group']) + if ($group['name'] == 'admins') $group['gid'] = 1999; else $group['gid'] = $config['system']['nextgid']++; @@ -1393,7 +1393,7 @@ function upgrade_048_to_049() { /* reset group scope information */ foreach ($config['system']['group'] as & $group) - if ($group['name'] != $g['admin_group']) + if ($group['name'] != 'admins') $group['scope'] = "user"; /* insert new all group */ diff --git a/src/etc/rc.initial.reboot b/src/etc/rc.initial.reboot index 7cc4c36b2..af25af5ff 100755 --- a/src/etc/rc.initial.reboot +++ b/src/etc/rc.initial.reboot @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -require_once("globals.inc"); +require_once("config.lib.inc"); require_once("util.inc"); require_once("system.inc");