summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--syslogd.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fda865b..901bc1d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@ Version 3.14.2 (rgerhards), 2008-04-??
- bugfix: potential segfault in imklog when kernel is compiled without
/proc/kallsyms and the file System.map is missing. Thanks to
Andrea Morandi for pointing it out and suggesting a fix.
+- bugfixes, credits to varmojfekoj:
+ * reset errno before printing a warning message
+ * misspelled directive name in code processing legacy options
---------------------------------------------------------------------------
Version 3.14.1 (rgerhards), 2008-04-04
- bugfix: some messages were emited without hostname
diff --git a/syslogd.c b/syslogd.c
index 4d9f8257..ca70e7c3 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");
}