some legacy options were not correctly processed

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
This commit is contained in:
varmojfekoj 2008-12-10 14:56:12 +01:00 committed by Rainer Gerhards
parent b0317d31d9
commit 054ae7bf17
2 changed files with 6 additions and 3 deletions

View File

@ -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

View File

@ -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':