summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/system.inc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-01-05 21:13:52 -0600
committerChris Buechler <cmb@pfsense.org>2016-01-05 21:13:52 -0600
commit6c301424fa6fb550d156e2b41fb6145720a60445 (patch)
treef83f35fde52409b419d8e37cc08454490c96df73 /src/etc/inc/system.inc
parentb7eb0ead89d530123147b30e78545316e59adbb9 (diff)
downloadpfsense-6c301424fa6fb550d156e2b41fb6145720a60445.zip
pfsense-6c301424fa6fb550d156e2b41fb6145720a60445.tar.gz
Only log to remote syslog server(s) if remote logging is enabled
Diffstat (limited to 'src/etc/inc/system.inc')
-rw-r--r--src/etc/inc/system.inc18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 847879d..fa8ac48 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -780,14 +780,16 @@ function system_syslogd_get_remote_servers($syslogcfg, $facility = "*.*") {
$remote_servers = "";
$pad_to = max(strlen($facility), 56);
$padding = ceil(($pad_to - strlen($facility))/8)+1;
- if ($syslogcfg['remoteserver']) {
- $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver']) . "\n";
- }
- if ($syslogcfg['remoteserver2']) {
- $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver2']) . "\n";
- }
- if ($syslogcfg['remoteserver3']) {
- $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver3']) . "\n";
+ if (isset($syslogcfg['enable'])) {
+ if ($syslogcfg['remoteserver']) {
+ $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver']) . "\n";
+ }
+ if ($syslogcfg['remoteserver2']) {
+ $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver2']) . "\n";
+ }
+ if ($syslogcfg['remoteserver3']) {
+ $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver3']) . "\n";
+ }
}
return $remote_servers;
}
OpenPOWER on IntegriCloud