lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

globals: thin out a bit more

Browse Source
This commit is contained in:
Franco Fichtner 2016-01-16 12:00:24 +01:00
parent 1cb6d444b4
commit 69ad2a3fc1
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/etc/inc/config.lib.inc
View File

@ -1,7 +1,7 @@
<?php
/*
Copyright (C) 2015 Franco Fichtner <franco@opnsense.org>
Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
Ported from config.inc by Erik Kristensen
Copyright (C) 2004-2010 Scott Ullrich
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
@ -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");

4
src/etc/inc/globals.inc
View File

@ -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",

4
src/etc/inc/upgrade_config.inc
View File

@ -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 */

2
src/etc/rc.initial.reboot
View File

@ -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");