summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-08 14:49:26 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-08 14:49:26 +0200
commit9ae630384e1d95d7289f44c8ac20597311704914 (patch)
tree7e4b106495d2fc0feda7b396146c16840d340a83 /syslogd.c
parent769598da4cfc7c9fb3ceb337044a9313e4b1b68d (diff)
downloadrsyslog-9ae630384e1d95d7289f44c8ac20597311704914.zip
rsyslog-9ae630384e1d95d7289f44c8ac20597311704914.tar.gz
rsyslog-9ae630384e1d95d7289f44c8ac20597311704914.tar.xz
- bugfixes in legacy options processing, credits to varmojfekoj
* reset errno before printing a warning message * misspelled directive name in code processing legacy options
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/syslogd.c b/syslogd.c
index 4d9f825..ca70e7c 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1741,6 +1741,7 @@ void legacyOptsHook(void)
while(pThis != NULL) {
if(pThis->line != NULL) {
+ errno = 0;
errmsg.LogError(NO_ERRCODE, "Warning: backward compatibility layer added to following "
"directive to rsyslog.conf: %s", pThis->line);
conf.cfsysline(pThis->line);
@@ -3109,7 +3110,7 @@ int realMain(int argc, char **argv)
legacyOptsEnq((uchar *) "ModLoad imuxsock");
bImUxSockLoaded = 1;
}
- legacyOptsEnq((uchar *) "OmitLocaLogging");
+ legacyOptsEnq((uchar *) "OmitLocalLogging");
} else {
fprintf(stderr, "error -o is no longer supported, use module imuxsock instead");
}