rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2026-08-31 00:30:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'debian_lenny' into v3-stable

Browse Source 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	net.h
	plugins/imtcp/imtcp.c
	plugins/imudp/imudp.c
	runtime/net.c
	runtime/rsyslog.h
	tcps_sess.c
	tcpsrv.c
This commit is contained in:
Rainer Gerhards 2008-12-10 15:20:27 +01:00
commit 6b1a023f25
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -208,6 +208,16 @@ Version 3.19.0 (rgerhards), 2008-05-06
- -c option no longer must be the first option - thanks to varmjofekoj - -c option no longer must be the first option - thanks to varmjofekoj
for the patch 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 Version 3.18.5 (rgerhards), 2008-10-09
- bugfix: imudp input module could cause segfault on HUP - bugfix: imudp input module could cause segfault on HUP
It did not properly de-init a variable acting as a linked list head. It did not properly de-init a variable acting as a linked list head.

7
tools/syslogd.c
View File

@ -417,8 +417,9 @@ static void processImInternal(void);
static int usage(void) static int usage(void)
{ {
fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n" fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
" [-fconffile] [-ipidfile]\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" "To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n"
"For further information see http://www.rsyslog.com/doc\n"); "For further information see http://www.rsyslog.com/doc\n");
exit(1); /* "good" exit - done to terminate usage() */ exit(1); /* "good" exit - done to terminate usage() */
@ -3008,7 +3009,7 @@ int realMain(int argc, char **argv)
* only when actually neeeded. * only when actually neeeded.
* rgerhards, 2008-04-04 * 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) { switch((char)ch) {
case '4': case '4':
case '6': case '6':