diff options
| author | varmojfekoj <theinric@redhat.com> | 2008-12-10 14:56:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 14:56:12 +0100 |
| commit | 054ae7bf174dbbf6721c0379d17383d0113dc90b (patch) | |
| tree | 59630cb929eaeacfd2c1c5573e4f1cb8bb4bde55 | |
| parent | b0317d31d98b17cd8b9b5d29f438191ac045cd33 (diff) | |
| download | rsyslog-054ae7bf174dbbf6721c0379d17383d0113dc90b.tar.gz rsyslog-054ae7bf174dbbf6721c0379d17383d0113dc90b.tar.xz rsyslog-054ae7bf174dbbf6721c0379d17383d0113dc90b.zip | |
some legacy options were not correctly processed
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | syslogd.c | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -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 @@ -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<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n" + " [-f<conffile>] [-i<pidfile>] [-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() */ @@ -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': |