From 9ae630384e1d95d7289f44c8ac20597311704914 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 8 Apr 2008 14:49:26 +0200 Subject: - bugfixes in legacy options processing, credits to varmojfekoj * reset errno before printing a warning message * misspelled directive name in code processing legacy options --- syslogd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'syslogd.c') 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"); } -- cgit From 2a6b13ae0d11244648f3705dc20cc90aa83b9a3d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 8 Apr 2008 17:10:52 +0200 Subject: bugfix: some legacy options not correctly interpreted - thanks to varmojfekoj for the patch --- syslogd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'syslogd.c') diff --git a/syslogd.c b/syslogd.c index ca70e7c3..4265bd45 100644 --- a/syslogd.c +++ b/syslogd.c @@ -3023,7 +3023,7 @@ int realMain(int argc, char **argv) /* END core initializations */ - while ((ch = getopt(argc, argv, "46Ac:dehi:f:g:l:m:M:nqQr::s:t:u:vwx")) != EOF) { + while ((ch = getopt(argc, argv, "46aAc:def:g:hi:l:m:M:nopqQr::s:t:u:vwx")) != EOF) { switch((char)ch) { case '4': family = PF_INET; -- cgit