diff options
Diffstat (limited to 'etc/inc/config.lib.inc')
| -rw-r--r-- | etc/inc/config.lib.inc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 951362f..64cbf0a 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -256,6 +256,7 @@ function parse_config_bootup() { } } else { unlock($lockkey); + log_error(gettext("Could not find a usable configuration file! Exiting....")); exit(0); } } @@ -272,7 +273,8 @@ function parse_config_bootup() { } } unlock($lockkey); - parse_config(true); + + $config = parse_config(true); if ((float)$config['version'] > (float)$g['latest_config']) { echo <<<EOD @@ -488,17 +490,6 @@ function safe_write_file($file, $content, $force_binary) { function write_config($desc="Unknown", $backup = true) { global $config, $g; - /* TODO: Not sure what this was added for; commenting out - * for now, since it was preventing config saving. */ - // $config = parse_config(true, false, false); - - /* Comment this check out for now. There aren't any current issues that - * make this problematic, and it makes users think there is a problem - * when one doesn't really exist. - if($g['booting']) - log_error("WARNING! Configuration written on bootup. This can cause stray openvpn and load balancing items in config.xml"); - */ - if (!empty($_SERVER['REMOTE_ADDR'])) { if (!session_id()) @session_start(); |
