From 054ae7bf174dbbf6721c0379d17383d0113dc90b Mon Sep 17 00:00:00 2001 From: varmojfekoj Date: Wed, 10 Dec 2008 14:56:12 +0100 Subject: some legacy options were not correctly processed Signed-off-by: Rainer Gerhards --- ChangeLog | 2 ++ syslogd.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d86cbbea..39839af4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +- some legacy options were not correctly processed. + Thanks to varmojfekoj for the patch. --------------------------------------------------------------------------- Version 3.18.6 (rgerhards), 2008-12-08 - security bugfix: $AllowedSender was not honored, all senders were diff --git a/syslogd.c b/syslogd.c index 6855a8a5..a6bba46f 100644 --- a/syslogd.c +++ b/syslogd.c @@ -447,8 +447,9 @@ static void processImInternal(void); static int usage(void) { - fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n" - " [-fconffile] [-ipidfile]\n" + fprintf(stderr, "usage: rsyslogd [-c] [-46AdnqQvwx] [-l] [-s]\n" + " [-f] [-i] [-M]\n" + " [-u]\n" "To run rsyslogd in native mode, use \"rsyslogd -c3 \"\n\n" "For further information see http://www.rsyslog.com/doc\n"); exit(1); /* "good" exit - done to terminate usage() */ @@ -3080,7 +3081,7 @@ int realMain(int argc, char **argv) * only when actually neeeded. * rgerhards, 2008-04-04 */ - while ((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nopqQr::s:t:u:vwx")) != EOF) { + while ((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nop:qQr::s:t:u:vwx")) != EOF) { switch((char)ch) { case '4': case '6': -- cgit