diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index bfbc761f0..f8ed5a5bb 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -605,38 +605,39 @@ function system_syslogd_start($verbose = false, $restart = false) configd_run('template reload OPNsense/Syslog'); - $syslogcfg = config_read_array('syslog'); + if (empty($config['syslog']['disable_clog'])) { + $syslogcfg = config_read_array('syslog'); - $log_directive = '%'; - $syslogd_extra = ''; + $log_directive = '%'; + $syslogd_extra = ''; - $syslogconf = ''; + $syslogconf = ''; - $syslogconfs = array(); + $syslogconfs = array(); - foreach (plugins_syslog() as $plugin_name => $plugin_details) { - $syslogconfs[$plugin_name] = $plugin_details; - } + foreach (plugins_syslog() as $plugin_name => $plugin_details) { + $syslogconfs[$plugin_name] = $plugin_details; + } - $separatelogfacilities = array(); - foreach ($syslogconfs as $logTopic => $logConfig) { - $syslogconf .= "!" . implode(',', $logConfig['facility']) . "\n"; - $separatelogfacilities = array_merge($logConfig['facility'], $separatelogfacilities); + $separatelogfacilities = array(); + foreach ($syslogconfs as $logTopic => $logConfig) { + $syslogconf .= "!" . implode(',', $logConfig['facility']) . "\n"; + $separatelogfacilities = array_merge($logConfig['facility'], $separatelogfacilities); + if (!isset($syslogcfg['disablelocallogging'])) { + $syslogconf .= "*.* {$log_directive}/var/log/{$logTopic}.log\n"; + } + if (!empty($logConfig['local'])) { + $syslogd_extra .= system_syslogd_extra_local($logConfig['local']); + } + } + $syslogd_extra .= '-p /var/run/legacy_log -S /var/run/legacy_logpriv -k -s -s '; + + asort($separatelogfacilities); + $facilitylist = implode(',', array_unique($separatelogfacilities)); + $syslogconf .= "!-{$facilitylist}\n"; if (!isset($syslogcfg['disablelocallogging'])) { - $syslogconf .= "*.* {$log_directive}/var/log/{$logTopic}.log\n"; - } - if (!empty($logConfig['local'])) { - $syslogd_extra .= system_syslogd_extra_local($logConfig['local']); - } - } - $syslogd_extra .= '-p /var/run/legacy_log -S /var/run/legacy_logpriv -k -s -s '; - - asort($separatelogfacilities); - $facilitylist = implode(',', array_unique($separatelogfacilities)); - $syslogconf .= "!-{$facilitylist}\n"; - if (!isset($syslogcfg['disablelocallogging'])) { - /* XXX non-system local redirects look unused */ - $syslogconf .= <<