Merge branch 'v3-stable' into beta

Conflicts:
	tools/syslogd.c

1 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 026a192a..1c541172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+- 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
@@ -342,6 +344,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.