Merge branch 'v6-stable' into v7-stable

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2be32c0f..08359874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -154,6 +154,13 @@ Version 7.1.0  [devel] 2012-09-06
 - bugfix: imtcp could abort on exit due to invalid free()
 - imported bugfixes from 6.4.1
 ---------------------------------------------------------------------------
+Version 6.6.1  [v6-stable] 2012-10-??
+- bugfix: build problems on some platforms
+- bugfix: misaddressing of $mmnormalizeuserawmsg parameter
+  On many platforms, this has no effect at all. At some, it may cause
+  a segfault. The problem occurs only during config phase, no segfault
+  happens when rsyslog has fully started.
+---------------------------------------------------------------------------
 Version 6.6.0  [v6-stable] 2012-10-22
 This starts a new stable branch, based on the 6.5.x series, plus:
 - bugfix: imuxsock did not properly honor $LocalHostIPIF
diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
index bf0b9ce6..b5f4ce18 100644
--- a/plugins/mmnormalize/mmnormalize.c
+++ b/plugins/mmnormalize/mmnormalize.c
@@ -71,7 +71,7 @@ typedef struct _instanceData {
 
 typedef struct configSettings_s {
 	uchar *rulebase;		/**< name of normalization rulebase to use */
-	sbool bUseRawMsg;	/**< use %rawmsg% instead of %msg% */
+	int bUseRawMsg;	/**< use %rawmsg% instead of %msg% */
 } configSettings_t;
 static configSettings_t cs;