diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:05:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:05:23 +0200 |
| commit | c574f90c450ece3e336612e232e464b7c8d08ab1 (patch) | |
| tree | 0682d86a7ea26bbf3db39f2aa82f6af2631d38b8 /syslogd.c | |
| parent | ee48fa29d919cb30a80e876aa851cd30e1c5f2a8 (diff) | |
| parent | 2a6b13ae0d11244648f3705dc20cc90aa83b9a3d (diff) | |
| download | rsyslog-c574f90c450ece3e336612e232e464b7c8d08ab1.tar.gz rsyslog-c574f90c450ece3e336612e232e464b7c8d08ab1.tar.xz rsyslog-c574f90c450ece3e336612e232e464b7c8d08ab1.zip | |
Merge branch 'v3-stable' into beta
Diffstat (limited to 'syslogd.c')
| -rw-r--r-- | syslogd.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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); @@ -3059,7 +3060,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; @@ -3146,7 +3147,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"); } |