diff options
| author | varmojfekoj <theinric@redhat.com> | 2008-12-10 15:24:48 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:24:48 +0100 |
| commit | 44e35af7a851ce920d4db312acd9a2cdf516a81c (patch) | |
| tree | 5098e3b27e7d325dc0dc79328279031eb5b243a2 | |
| parent | cec70434052c19e3de5197f5ad363efb874afd61 (diff) | |
| download | rsyslog-44e35af7a851ce920d4db312acd9a2cdf516a81c.tar.gz rsyslog-44e35af7a851ce920d4db312acd9a2cdf516a81c.tar.bz2 rsyslog-44e35af7a851ce920d4db312acd9a2cdf516a81c.zip | |
some legacy options were not correctly processed
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | tools/syslogd.c | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,7 @@ +--------------------------------------------------------------------------- +Version 3.21.10 [BETA] (rgerhards), 2008-12-?? +- some legacy options were not correctly processed. + Thanks to varmojfekoj for the patch. - doc bugfix: v3-compatiblity document had typo in config directive thanks to Andrej for reporting this --------------------------------------------------------------------------- diff --git a/tools/syslogd.c b/tools/syslogd.c index 7a99fc1d..fd34c9f5 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -391,8 +391,9 @@ static void processImInternal(void); static int usage(void) { - fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n" - " [-fconffile] [-ipidfile] [-Nlevel]\n" + fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n" + " [-f<conffile>] [-i<pidfile>] [-N<level>] [-M<module load path>]\n" + " [-u<number>]\n" "To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n" "For further information see http://www.rsyslog.com/doc\n"); exit(1); /* "good" exit - done to terminate usage() */ @@ -3164,7 +3165,7 @@ int realMain(int argc, char **argv) * only when actually neeeded. * rgerhards, 2008-04-04 */ - while((ch = getopt(argc, argv, "46aAc:def:g:hi:l:m:M:nN:opqQr::s:t:u:vwx")) != EOF) { + while((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nN:op:qQr::s:t:u:vwx")) != EOF) { switch((char)ch) { case '4': case '6': |