summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-08 18:06:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-08 18:06:57 +0200
commit060ea06c41012a00db17cfbd2cff5b2eade3eb51 (patch)
treed7759af829587dbd1a4b1de9745c5b3db0053bd7 /syslogd.c
parent285444aa313454b09ad0cac1e29f326cd4373096 (diff)
parentc574f90c450ece3e336612e232e464b7c8d08ab1 (diff)
downloadrsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.zip
rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.gz
rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.xz
Merge branch 'beta'
Conflicts: syslogd.c
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/syslogd.c b/syslogd.c
index b56c2f3..59fbbc2 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1746,6 +1746,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);
@@ -3066,7 +3067,7 @@ int realMain(int argc, char **argv)
* only when actually neeeded.
* rgerhards, 2008-04-04
*/
- 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':
case '6':
@@ -3280,7 +3281,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");
}