diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:29:15 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:29:15 +0100 |
| commit | ee79ff3214beeaf97c62be3638876a0610c77afa (patch) | |
| tree | 09f29984f5d2afcc576fc7a04d9518b7125281f5 | |
| parent | 483be404716d8e3e55f200955e1904219eb97a9b (diff) | |
| parent | 44e35af7a851ce920d4db312acd9a2cdf516a81c (diff) | |
| download | rsyslog-ee79ff3214beeaf97c62be3638876a0610c77afa.tar.gz rsyslog-ee79ff3214beeaf97c62be3638876a0610c77afa.tar.xz rsyslog-ee79ff3214beeaf97c62be3638876a0610c77afa.zip | |
Merge branch 'beta'
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | tools/syslogd.c | 7 |
2 files changed, 20 insertions, 3 deletions
@@ -73,6 +73,12 @@ version before switching to this one. - bugfix: memory leak in ompgsql Thanks to Ken for providing the patch --------------------------------------------------------------------------- +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 +--------------------------------------------------------------------------- Version 3.21.9 [BETA] (rgerhards), 2008-12-04 - re-release of 3.21.8 with an additional fix, that could also lead to DoS; 3.21.8 has been removed from the official download archives @@ -419,6 +425,16 @@ Version 3.19.0 (rgerhards), 2008-05-06 - -c option no longer must be the first option - thanks to varmjofekoj for the patch --------------------------------------------------------------------------- +Version 3.18.7 (rgerhards), 2008-12-?? +- 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 + permitted instead (see http://www.rsyslog.com/Article322.phtml) + (backport from v3-stable, v3.20.9) +- minor bugfix: dual close() call on tcp session closure +--------------------------------------------------------------------------- Version 3.18.5 (rgerhards), 2008-10-09 - bugfix: imudp input module could cause segfault on HUP It did not properly de-init a variable acting as a linked list head. diff --git a/tools/syslogd.c b/tools/syslogd.c index d132d139..138bdfd8 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -395,8 +395,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() */ @@ -3302,7 +3303,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': |