Merge branch 'debian_lenny' into v3-stable

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

2 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 680c67ad..be7a979d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -208,6 +208,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 439ca303..b32ce029 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -417,8 +417,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() */
@@ -3008,7 +3009,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':