From 4d35185317fd03e2a820013e7ab3ca5c760db670 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 21 Feb 2011 08:14:01 +0100
Subject: regression: fixed compile error with --enable-debug

---
 tools/iminternal.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/iminternal.c b/tools/iminternal.c
index 12534ba0..167e2b29 100644
--- a/tools/iminternal.c
+++ b/tools/iminternal.c
@@ -123,7 +123,6 @@ rsRetVal iminternalRemoveMsg(msg_t **ppMsg)
 	iminternal_t *pThis;
 	linkedListCookie_t llCookie = NULL;
 
-	assert(pPri != NULL);
 	assert(ppMsg != NULL);
 
 	CHKiRet(llGetNextElt(&llMsgs, &llCookie, (void*)&pThis));
-- 
cgit v1.2.3


From 026f59388a105597c3c6890bb0c83652cb712903 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 21 Feb 2011 09:10:45 +0100
Subject: bugfix: imuxsock did no longer remove trailing LF

This was a regression from the imuxsock partial rewrite. Happened
because the message is no longer run through the standard parsers.
Now imuxsock does this sanitization itself.
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=224
---
 ChangeLog                   | 5 +++++
 plugins/imuxsock/imuxsock.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d502ce35..71e6f3ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ Version 5.7.5  [V5-BETA] (rgerhards), 2011-02-??
   we do this directly in the beta because a) it does not affect existing
   functionality and b) one may argue that this missing functionality is
   close to a bug.
+- bugfix: imuxsock did no longer remove trailing LF
+  This was a regression from the imuxsock partial rewrite. Happened
+  because the message is no longer run through the standard parsers. 
+  Now imuxsock does this sanitization itself.
+  bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=224
 - bugfix: minor race condition in action.c - considered cosmetic
   This is considered cosmetic as multiple threads tried to write exactly
   the same value into the same memory location without sync. The method
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 75f97db4..136e4196 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -517,6 +517,10 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 	 * rate-limiting as well.
 	 */
 	parse = pRcv;
+	if(pRcv[lenRcv-1] = '\n') {
+		DBGPRINTF("imuxsock: found trailing LF, removing\n");
+		lenRcv--;
+	}
 	lenMsg = lenRcv;
 	
 	parse++; lenMsg--; /* '<' */
-- 
cgit v1.2.3


From 314d3532109cca574aabc3e960586f499966e868 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 21 Feb 2011 11:41:50 +0100
Subject: fixed dumb but important typo in code...

thanks to Michael Biebl for alterting me
---
 plugins/imuxsock/imuxsock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 136e4196..0b5ca6be 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -517,7 +517,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 	 * rate-limiting as well.
 	 */
 	parse = pRcv;
-	if(pRcv[lenRcv-1] = '\n') {
+	if(pRcv[lenRcv-1] == '\n') {
 		DBGPRINTF("imuxsock: found trailing LF, removing\n");
 		lenRcv--;
 	}
-- 
cgit v1.2.3


From 36c1649fc187090bfd5af2c48bb44ce25a0fdef6 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 21 Feb 2011 14:08:37 +0100
Subject: improved testbench, added tests for imuxsock

---
 ChangeLog                                   |  1 +
 tests/Makefile.am                           | 13 ++++++++++++-
 tests/imuxsock_logger_root.sh               | 18 ++++++++++++++++++
 tests/imuxsock_traillf_root.sh              | 18 ++++++++++++++++++
 tests/resultdata/imuxsock_logger.log        |  1 +
 tests/resultdata/imuxsock_traillf.log       |  1 +
 tests/syslog_lf.c                           |  9 +++++++++
 tests/testsuites/imuxsock_logger_root.conf  |  7 +++++++
 tests/testsuites/imuxsock_traillf_root.conf |  7 +++++++
 9 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100755 tests/imuxsock_logger_root.sh
 create mode 100755 tests/imuxsock_traillf_root.sh
 create mode 100644 tests/resultdata/imuxsock_logger.log
 create mode 100644 tests/resultdata/imuxsock_traillf.log
 create mode 100644 tests/syslog_lf.c
 create mode 100644 tests/testsuites/imuxsock_logger_root.conf
 create mode 100644 tests/testsuites/imuxsock_traillf_root.conf

diff --git a/ChangeLog b/ChangeLog
index 71e6f3ed..82dd5ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Version 5.7.5  [V5-BETA] (rgerhards), 2011-02-??
   we do this directly in the beta because a) it does not affect existing
   functionality and b) one may argue that this missing functionality is
   close to a bug.
+- improved testbench, added tests for imuxsock
 - bugfix: imuxsock did no longer remove trailing LF
   This was a regression from the imuxsock partial rewrite. Happened
   because the message is no longer run through the standard parsers. 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 25d972d7..0ea66b0f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 if ENABLE_TESTBENCH
 TESTRUNS = rt_init rscript
-check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq msleep randomgen diagtalker uxsockrcvr syslog_caller
+check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq msleep randomgen diagtalker uxsockrcvr syslog_caller syslog_lf
 TESTS = $(TESTRUNS) cfg.sh \
 	arrayqueue.sh \
 	linkedlistqueue.sh \
@@ -46,6 +46,8 @@ TESTS = $(TESTRUNS) cfg.sh \
 	pipe_noreader.sh \
 	dircreate_dflt.sh \
 	dircreate_off.sh \
+	imuxsock_logger_root.sh \
+	imuxsock_traillf_root.sh \
 	queue-persist.sh 
 
 if ENABLE_IMPTCP
@@ -316,6 +318,12 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   testsuites/dircreate_dflt.conf \
 	   dircreate_off.sh \
 	   testsuites/dircreate_off.conf \
+	   imuxsock_logger_root.sh \
+	   testsuites/imuxsock_logger_root.conf \
+	   resultdata/imuxsock_logger.log \
+	   imuxsock_traillf_root.sh \
+	   testsuites/imuxsock_traillf_root.conf \
+	   resultdata/imuxsock_traillf.log \
 	   cfg.sh
 
 ourtail_SOURCES = ourtail.c
@@ -331,6 +339,9 @@ tcpflood_LDADD = $(SOL_LIBS)
 syslog_caller_SOURCES = syslog_caller.c
 syslog_caller_LDADD = $(SOL_LIBS)
 
+syslog_lf_SOURCES = syslog_lf.c
+syslog_lf_LDADD = $(SOL_LIBS)
+
 diagtalker_SOURCES = diagtalker.c
 diagtalker_LDADD = $(SOL_LIBS)
 
diff --git a/tests/imuxsock_logger_root.sh b/tests/imuxsock_logger_root.sh
new file mode 100755
index 00000000..e94a83fe
--- /dev/null
+++ b/tests/imuxsock_logger_root.sh
@@ -0,0 +1,18 @@
+# note: we must be root and no other syslogd running in order to
+# carry out this test.
+echo \[imuxsock_logger_root.sh\]: test trailing LF handling in imuxsock
+echo This test must be run as root with no other active syslogd
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup imuxsock_logger_root.conf
+# send a message with trailing LF
+logger test
+# the sleep below is needed to prevent too-early termination of rsyslogd
+$srcdir/msleep 100
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown	# we need to wait until rsyslogd is finished!
+cmp rsyslog.out.log $srcdir/resultdata/imuxsock_logger.log
+if [ ! $? -eq 0 ]; then
+echo "imuxsock_logger.sh failed"
+exit 1
+fi;
+source $srcdir/diag.sh exit
diff --git a/tests/imuxsock_traillf_root.sh b/tests/imuxsock_traillf_root.sh
new file mode 100755
index 00000000..c838e0bd
--- /dev/null
+++ b/tests/imuxsock_traillf_root.sh
@@ -0,0 +1,18 @@
+# note: we must be root and no other syslogd running in order to
+# carry out this test
+echo \[imuxsock_traillf_root.sh\]: test trailing LF handling in imuxsock
+echo This test must be run as root with no other active syslogd
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup imuxsock_traillf_root.conf
+# send a message with trailing LF
+$srcdir/syslog_lf
+# the sleep below is needed to prevent too-early termination of rsyslogd
+$srcdir/msleep 100
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown	# we need to wait until rsyslogd is finished!
+cmp rsyslog.out.log $srcdir/resultdata/imuxsock_traillf.log
+if [ ! $? -eq 0 ]; then
+echo "imuxsock_traillf_root.sh failed"
+exit 1
+fi;
+source $srcdir/diag.sh exit
diff --git a/tests/resultdata/imuxsock_logger.log b/tests/resultdata/imuxsock_logger.log
new file mode 100644
index 00000000..883dabdf
--- /dev/null
+++ b/tests/resultdata/imuxsock_logger.log
@@ -0,0 +1 @@
+ test
diff --git a/tests/resultdata/imuxsock_traillf.log b/tests/resultdata/imuxsock_traillf.log
new file mode 100644
index 00000000..883dabdf
--- /dev/null
+++ b/tests/resultdata/imuxsock_traillf.log
@@ -0,0 +1 @@
+ test
diff --git a/tests/syslog_lf.c b/tests/syslog_lf.c
new file mode 100644
index 00000000..a140244e
--- /dev/null
+++ b/tests/syslog_lf.c
@@ -0,0 +1,9 @@
+/* This tool deliberately logs a message with the a trailing LF */
+#include <stdio.h>
+#include <syslog.h>
+
+int main()
+{
+	syslog(LOG_NOTICE, "test\n");
+	return 0;
+}
diff --git a/tests/testsuites/imuxsock_logger_root.conf b/tests/testsuites/imuxsock_logger_root.conf
new file mode 100644
index 00000000..8336ecfa
--- /dev/null
+++ b/tests/testsuites/imuxsock_logger_root.conf
@@ -0,0 +1,7 @@
+# rgerhards, 2011-02-21
+$IncludeConfig diag-common.conf
+
+$ModLoad ../plugins/imuxsock/.libs/imuxsock
+
+$template outfmt,"%msg:%\n"
+*.notice	./rsyslog.out.log;outfmt
diff --git a/tests/testsuites/imuxsock_traillf_root.conf b/tests/testsuites/imuxsock_traillf_root.conf
new file mode 100644
index 00000000..8336ecfa
--- /dev/null
+++ b/tests/testsuites/imuxsock_traillf_root.conf
@@ -0,0 +1,7 @@
+# rgerhards, 2011-02-21
+$IncludeConfig diag-common.conf
+
+$ModLoad ../plugins/imuxsock/.libs/imuxsock
+
+$template outfmt,"%msg:%\n"
+*.notice	./rsyslog.out.log;outfmt
-- 
cgit v1.2.3


From 70bd55d51b6107231b841bfa03d5620bf984e3f2 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 22 Feb 2011 11:55:12 +0100
Subject: bugfix: imuxsock does not sanitization at all (regression)

This also causes problems when NUL characters are present inside
the message (as is the case with spamd).
---
 ChangeLog                   | 3 +--
 plugins/imuxsock/imuxsock.c | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 82dd5ac1..f771ad54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,10 +5,9 @@ Version 5.7.5  [V5-BETA] (rgerhards), 2011-02-??
   functionality and b) one may argue that this missing functionality is
   close to a bug.
 - improved testbench, added tests for imuxsock
-- bugfix: imuxsock did no longer remove trailing LF
+- bugfix: imuxsock did no longer sanitize received messages
   This was a regression from the imuxsock partial rewrite. Happened
   because the message is no longer run through the standard parsers. 
-  Now imuxsock does this sanitization itself.
   bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=224
 - bugfix: minor race condition in action.c - considered cosmetic
   This is considered cosmetic as multiple threads tried to write exactly
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 0b5ca6be..9f1e51b7 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -46,6 +46,7 @@
 #include "net.h"
 #include "glbl.h"
 #include "msg.h"
+#include "parser.h"
 #include "prop.h"
 #include "debug.h"
 #include "unlimited_select.h"
@@ -81,6 +82,7 @@ DEF_IMOD_STATIC_DATA
 DEFobjCurrIf(errmsg)
 DEFobjCurrIf(glbl)
 DEFobjCurrIf(prop)
+DEFobjCurrIf(parser)
 DEFobjCurrIf(datetime)
 DEFobjCurrIf(statsobj)
 
@@ -517,10 +519,6 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 	 * rate-limiting as well.
 	 */
 	parse = pRcv;
-	if(pRcv[lenRcv-1] == '\n') {
-		DBGPRINTF("imuxsock: found trailing LF, removing\n");
-		lenRcv--;
-	}
 	lenMsg = lenRcv;
 	
 	parse++; lenMsg--; /* '<' */
@@ -547,6 +545,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 	/* we now create our own message object and submit it to the queue */
 	CHKiRet(msgConstructWithTime(&pMsg, &st, tt));
 	MsgSetRawMsg(pMsg, (char*)pRcv, lenRcv);
+	parser.SanitizeMsg(pMsg);
 	MsgSetInputName(pMsg, pInputName);
 	MsgSetFlowControlType(pMsg, pLstn->flowCtl);
 
@@ -840,6 +839,7 @@ BEGINmodExit
 CODESTARTmodExit
 	statsobj.Destruct(&modStats);
 
+	objRelease(parser, CORE_COMPONENT);
 	objRelease(glbl, CORE_COMPONENT);
 	objRelease(errmsg, CORE_COMPONENT);
 	objRelease(prop, CORE_COMPONENT);
@@ -901,6 +901,7 @@ CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(prop, CORE_COMPONENT));
 	CHKiRet(objUse(statsobj, CORE_COMPONENT));
 	CHKiRet(objUse(datetime, CORE_COMPONENT));
+	CHKiRet(objUse(parser, CORE_COMPONENT));
 
 	dbgprintf("imuxsock version %s initializing\n", PACKAGE_VERSION);
 
-- 
cgit v1.2.3


From b7ee1de6b0dbdc67bbb239f44719fb4a50054fb5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 22 Feb 2011 15:35:52 +0100
Subject: the last fix introduced another regression, fixed now

The previous fix left variable lenMsg in an inconsistent state when
sanitization actually happend. This could lead to message truncation.
---
 plugins/imuxsock/imuxsock.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 9f1e51b7..ff38852c 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -503,6 +503,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 {
 	msg_t *pMsg;
 	int lenMsg;
+	int offs;
 	int i;
 	uchar *parse;
 	int pri;
@@ -520,13 +521,14 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 	 */
 	parse = pRcv;
 	lenMsg = lenRcv;
+	offs = 1; /* '<' */
 	
-	parse++; lenMsg--; /* '<' */
+	parse++;
 	pri = 0;
-	while(lenMsg && isdigit(*parse)) {
+	while(offs < lenMsg && isdigit(*parse)) {
 		pri = pri * 10 + *parse - '0';
 		++parse;
-		--lenMsg;
+		++offs;
 	} 
 	facil = LOG_FAC(pri);
 	sever = LOG_PRI(pri);
@@ -546,12 +548,13 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 	CHKiRet(msgConstructWithTime(&pMsg, &st, tt));
 	MsgSetRawMsg(pMsg, (char*)pRcv, lenRcv);
 	parser.SanitizeMsg(pMsg);
+	lenMsg = pMsg->iLenRawMsg - offs;
 	MsgSetInputName(pMsg, pInputName);
 	MsgSetFlowControlType(pMsg, pLstn->flowCtl);
 
 	pMsg->iFacility = facil;
 	pMsg->iSeverity = sever;
-	MsgSetAfterPRIOffs(pMsg, lenRcv - lenMsg);
+	MsgSetAfterPRIOffs(pMsg, offs);
 
 	parse++; lenMsg--; /* '>' */
 
@@ -571,7 +574,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
 		fixPID(bufParseTAG, &i, cred);
 	MsgSetTAG(pMsg, bufParseTAG, i);
 
-	MsgSetMSGoffs(pMsg, lenRcv - lenMsg);
+	MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg);
 
 	if(pLstn->bParseHost) {
 		pMsg->msgFlags  = pLstn->flags | PARSE_HOSTNAME;
-- 
cgit v1.2.3


From 87bffff894a6ed82f126e6af33beaf53efb6b4c5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 22 Feb 2011 16:10:21 +0100
Subject: added one more test for imuxsock to autmatted test suite

control character escaping is now also being tested
---
 tests/Makefile.am                            | 10 +++++++---
 tests/imuxsock_ccmiddle_root.sh              | 18 ++++++++++++++++++
 tests/imuxsock_traillf_root.sh               |  2 +-
 tests/resultdata/imuxsock_ccmiddle.log       |  1 +
 tests/syslog_inject.c                        | 28 ++++++++++++++++++++++++++++
 tests/syslog_lf.c                            |  9 ---------
 tests/testsuites/imuxsock_ccmiddle_root.conf |  7 +++++++
 7 files changed, 62 insertions(+), 13 deletions(-)
 create mode 100755 tests/imuxsock_ccmiddle_root.sh
 create mode 100644 tests/resultdata/imuxsock_ccmiddle.log
 create mode 100644 tests/syslog_inject.c
 delete mode 100644 tests/syslog_lf.c
 create mode 100644 tests/testsuites/imuxsock_ccmiddle_root.conf

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ea66b0f..f66270ab 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 if ENABLE_TESTBENCH
 TESTRUNS = rt_init rscript
-check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq msleep randomgen diagtalker uxsockrcvr syslog_caller syslog_lf
+check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq msleep randomgen diagtalker uxsockrcvr syslog_caller syslog_inject
 TESTS = $(TESTRUNS) cfg.sh \
 	arrayqueue.sh \
 	linkedlistqueue.sh \
@@ -48,6 +48,7 @@ TESTS = $(TESTRUNS) cfg.sh \
 	dircreate_off.sh \
 	imuxsock_logger_root.sh \
 	imuxsock_traillf_root.sh \
+	imuxsock_ccmiddle_root.sh \
 	queue-persist.sh 
 
 if ENABLE_IMPTCP
@@ -324,6 +325,9 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   imuxsock_traillf_root.sh \
 	   testsuites/imuxsock_traillf_root.conf \
 	   resultdata/imuxsock_traillf.log \
+	   imuxsock_ccmiddle_root.sh \
+	   testsuites/imuxsock_ccmiddle_root.conf \
+	   resultdata/imuxsock_ccmiddle.log \
 	   cfg.sh
 
 ourtail_SOURCES = ourtail.c
@@ -339,8 +343,8 @@ tcpflood_LDADD = $(SOL_LIBS)
 syslog_caller_SOURCES = syslog_caller.c
 syslog_caller_LDADD = $(SOL_LIBS)
 
-syslog_lf_SOURCES = syslog_lf.c
-syslog_lf_LDADD = $(SOL_LIBS)
+syslog_inject_SOURCES = syslog_inject.c
+syslog_inject_LDADD = $(SOL_LIBS)
 
 diagtalker_SOURCES = diagtalker.c
 diagtalker_LDADD = $(SOL_LIBS)
diff --git a/tests/imuxsock_ccmiddle_root.sh b/tests/imuxsock_ccmiddle_root.sh
new file mode 100755
index 00000000..07d23c21
--- /dev/null
+++ b/tests/imuxsock_ccmiddle_root.sh
@@ -0,0 +1,18 @@
+# note: we must be root and no other syslogd running in order to
+# carry out this test
+echo \[imuxsock_ccmiddle_root.sh\]: test trailing LF handling in imuxsock
+echo This test must be run as root with no other active syslogd
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup imuxsock_ccmiddle_root.conf
+# send a message with trailing LF
+$srcdir/syslog_inject -c
+# the sleep below is needed to prevent too-early termination of rsyslogd
+$srcdir/msleep 100
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown	# we need to wait until rsyslogd is finished!
+cmp rsyslog.out.log $srcdir/resultdata/imuxsock_ccmiddle.log
+if [ ! $? -eq 0 ]; then
+echo "imuxsock_ccmiddle_root.sh failed"
+exit 1
+fi;
+source $srcdir/diag.sh exit
diff --git a/tests/imuxsock_traillf_root.sh b/tests/imuxsock_traillf_root.sh
index c838e0bd..02fb6d2c 100755
--- a/tests/imuxsock_traillf_root.sh
+++ b/tests/imuxsock_traillf_root.sh
@@ -5,7 +5,7 @@ echo This test must be run as root with no other active syslogd
 source $srcdir/diag.sh init
 source $srcdir/diag.sh startup imuxsock_traillf_root.conf
 # send a message with trailing LF
-$srcdir/syslog_lf
+$srcdir/syslog_inject -l
 # the sleep below is needed to prevent too-early termination of rsyslogd
 $srcdir/msleep 100
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
diff --git a/tests/resultdata/imuxsock_ccmiddle.log b/tests/resultdata/imuxsock_ccmiddle.log
new file mode 100644
index 00000000..d2531f9d
--- /dev/null
+++ b/tests/resultdata/imuxsock_ccmiddle.log
@@ -0,0 +1 @@
+ test 1#0112
diff --git a/tests/syslog_inject.c b/tests/syslog_inject.c
new file mode 100644
index 00000000..a5d77b1a
--- /dev/null
+++ b/tests/syslog_inject.c
@@ -0,0 +1,28 @@
+/* This tool deliberately logs a message with the a trailing LF */
+/* Options:
+ * -l: inject linefeed at end of message
+ * -c: inject control character in middle of message
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <string.h>
+
+static inline void usage(void) {
+	fprintf(stderr, "Usage: syslog_inject [-l] [-c]\n");
+	exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+	if(argc != 2)
+		usage();
+	if(!strcmp(argv[1], "-l"))
+		syslog(LOG_NOTICE, "test\n");
+	else if(!strcmp(argv[1], "-c"))
+		syslog(LOG_NOTICE, "test 1\t2");
+	else
+		usage();
+
+	return 0;
+}
diff --git a/tests/syslog_lf.c b/tests/syslog_lf.c
deleted file mode 100644
index a140244e..00000000
--- a/tests/syslog_lf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This tool deliberately logs a message with the a trailing LF */
-#include <stdio.h>
-#include <syslog.h>
-
-int main()
-{
-	syslog(LOG_NOTICE, "test\n");
-	return 0;
-}
diff --git a/tests/testsuites/imuxsock_ccmiddle_root.conf b/tests/testsuites/imuxsock_ccmiddle_root.conf
new file mode 100644
index 00000000..8336ecfa
--- /dev/null
+++ b/tests/testsuites/imuxsock_ccmiddle_root.conf
@@ -0,0 +1,7 @@
+# rgerhards, 2011-02-21
+$IncludeConfig diag-common.conf
+
+$ModLoad ../plugins/imuxsock/.libs/imuxsock
+
+$template outfmt,"%msg:%\n"
+*.notice	./rsyslog.out.log;outfmt
-- 
cgit v1.2.3


From de898fd5893b1b4811cc513a52af5dabcedc5291 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 22 Feb 2011 17:33:40 +0100
Subject: bugfix (minor): warning message suggested invalid compatibility mode

---
 tools/syslogd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/syslogd.c b/tools/syslogd.c
index c4a3b270..574c2efa 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2875,7 +2875,7 @@ int realMain(int argc, char **argv)
 	if(iCompatibilityMode < 4) {
 		errmsg.LogError(0, NO_ERRCODE, "WARNING: rsyslogd is running in compatibility mode. Automatically "
 		                            "generated config directives may interfer with your rsyslog.conf settings. "
-					    "We suggest upgrading your config and adding -c4 as the first "
+					    "We suggest upgrading your config and adding -c5 as the first "
 					    "rsyslogd option.");
 	}
 
-- 
cgit v1.2.3


From 095a7ec73883ff14ff428653a5fa153892c1497a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 23 Feb 2011 08:45:34 +0100
Subject: preparing for 5.7.5 release

---
 ChangeLog       | 2 +-
 configure.ac    | 2 +-
 doc/manual.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f771ad54..09ccf46b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 5.7.5  [V5-BETA] (rgerhards), 2011-02-??
+Version 5.7.5  [V5-BETA] (rgerhards), 2011-02-23
 - enhance: imfile did not yet support multiple rulesets, now added
   we do this directly in the beta because a) it does not affect existing
   functionality and b) one may argue that this missing functionality is
diff --git a/configure.ac b/configure.ac
index 987711e0..aac884e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[5.7.4],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.7.5],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 4be37fd5..c8988b1a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
 <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
 to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
 project goals.</p>
-<p><b>This documentation is for version 5.7.4 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.7.5 (beta branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might
-- 
cgit v1.2.3


From e867cb41372e9b8e08b8eec0d663a1f3ccea5367 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 23 Feb 2011 08:54:31 +0100
Subject: added debug support for trying to find well-hidden bug

---
 runtime/msg.c | 10 ++++++++++
 runtime/msg.h |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/runtime/msg.c b/runtime/msg.c
index e8be79db..fb4d5742 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -677,6 +677,7 @@ static inline rsRetVal msgBaseConstruct(msg_t **ppThis)
 	/* initialize members in ORDER they appear in structure (think "cache line"!) */
 	pM->flowCtlType = 0;
 	pM->bDoLock = 0;
+	pM->bAlreadyFreed = 0;
 	pM->iRefCount = 1;
 	pM->iSeverity = -1;
 	pM->iFacility = -1;
@@ -803,6 +804,15 @@ CODESTARTobjDestruct(msg)
 	if(currRefCount == 0)
 	{
 		/* DEV Debugging Only! dbgprintf("msgDestruct\t0x%lx, RefCount now 0, doing DESTROY\n", (unsigned long)pThis); */
+		/* The if below is included to try to nail down a well-hidden bug causing
+		 * segfaults. I hope that do to the test code the problem is sooner detected and
+		 * thus we get better data for debugging and resolving it. -- rgerhards, 2011-02-23.
+		 * TODO: remove when no longer needed.
+		 */
+		if(pThis->bAlreadyFreed)
+			abort();
+		pThis->bAlreadyFreed = 1;
+		/* end debug code */
 		if(pThis->pszRawMsg != pThis->szRawMsg)
 			free(pThis->pszRawMsg);
 		freeTAG(pThis);
diff --git a/runtime/msg.h b/runtime/msg.h
index 4897959c..26a07aca 100644
--- a/runtime/msg.h
+++ b/runtime/msg.h
@@ -61,7 +61,8 @@ struct msg {
 				        once data has entered the queue, this property is no longer needed. */
 	pthread_mutex_t mut;
 	int	iRefCount;	/* reference counter (0 = unused) */
-	sbool	bDoLock;	 /* use the mutex? */
+	sbool	bDoLock;	/* use the mutex? */
+	sbool	bAlreadyFreed;	/* aid to help detect a well-hidden bad bug -- TODO: remove when no longer needed */
 	short	iSeverity;	/* the severity 0..7 */
 	short	iFacility;	/* Facility code 0 .. 23*/
 	short	offAfterPRI;	/* offset, at which raw message WITHOUT PRI part starts in pszRawMsg */
-- 
cgit v1.2.3


From ee065f1cb55be56da6ed12b35cd0e686abcb3a10 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 23 Feb 2011 09:01:57 +0100
Subject: fixed testsuite problems during make distcheck

---
 tests/imuxsock_ccmiddle_root.sh | 4 ++--
 tests/imuxsock_logger_root.sh   | 2 +-
 tests/imuxsock_traillf_root.sh  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/imuxsock_ccmiddle_root.sh b/tests/imuxsock_ccmiddle_root.sh
index 07d23c21..b487611a 100755
--- a/tests/imuxsock_ccmiddle_root.sh
+++ b/tests/imuxsock_ccmiddle_root.sh
@@ -5,9 +5,9 @@ echo This test must be run as root with no other active syslogd
 source $srcdir/diag.sh init
 source $srcdir/diag.sh startup imuxsock_ccmiddle_root.conf
 # send a message with trailing LF
-$srcdir/syslog_inject -c
+./syslog_inject -c
 # the sleep below is needed to prevent too-early termination of rsyslogd
-$srcdir/msleep 100
+./msleep 100
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
 source $srcdir/diag.sh wait-shutdown	# we need to wait until rsyslogd is finished!
 cmp rsyslog.out.log $srcdir/resultdata/imuxsock_ccmiddle.log
diff --git a/tests/imuxsock_logger_root.sh b/tests/imuxsock_logger_root.sh
index e94a83fe..377999f7 100755
--- a/tests/imuxsock_logger_root.sh
+++ b/tests/imuxsock_logger_root.sh
@@ -7,7 +7,7 @@ source $srcdir/diag.sh startup imuxsock_logger_root.conf
 # send a message with trailing LF
 logger test
 # the sleep below is needed to prevent too-early termination of rsyslogd
-$srcdir/msleep 100
+./msleep 100
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
 source $srcdir/diag.sh wait-shutdown	# we need to wait until rsyslogd is finished!
 cmp rsyslog.out.log $srcdir/resultdata/imuxsock_logger.log
diff --git a/tests/imuxsock_traillf_root.sh b/tests/imuxsock_traillf_root.sh
index 02fb6d2c..1b821ee7 100755
--- a/tests/imuxsock_traillf_root.sh
+++ b/tests/imuxsock_traillf_root.sh
@@ -5,9 +5,9 @@ echo This test must be run as root with no other active syslogd
 source $srcdir/diag.sh init
 source $srcdir/diag.sh startup imuxsock_traillf_root.conf
 # send a message with trailing LF
-$srcdir/syslog_inject -l
+./syslog_inject -l
 # the sleep below is needed to prevent too-early termination of rsyslogd
-$srcdir/msleep 100
+./msleep 100
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
 source $srcdir/diag.sh wait-shutdown	# we need to wait until rsyslogd is finished!
 cmp rsyslog.out.log $srcdir/resultdata/imuxsock_traillf.log
-- 
cgit v1.2.3


From 7bccae395b83416be6bea2de69fdfcce46995acf Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 23 Feb 2011 16:22:17 +0000
Subject: fixed compile problems on Solaris

---
 plugins/imuxsock/imuxsock.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index ff38852c..7ee413e7 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -606,7 +606,9 @@ static rsRetVal readSocket(lstn_t *pLstn)
 	int iMaxLine;
 	struct msghdr msgh;
 	struct iovec msgiov;
+#	if HAVE_SCM_CREDENTIALS
 	struct cmsghdr *cm;
+#	endif
 	struct ucred *cred;
 	uchar bufRcv[4096+1];
 	char aux[128];
@@ -630,11 +632,13 @@ static rsRetVal readSocket(lstn_t *pLstn)
 
 	memset(&msgh, 0, sizeof(msgh));
 	memset(&msgiov, 0, sizeof(msgiov));
+#	if HAVE_SCM_CREDENTIALS
 	if(pLstn->bUseCreds) {
 		memset(&aux, 0, sizeof(aux));
 		msgh.msg_control = aux;
 		msgh.msg_controllen = sizeof(aux);
 	}
+#	endif
 	msgiov.iov_base = pRcv;
 	msgiov.iov_len = iMaxLine;
 	msgh.msg_iov = &msgiov;
-- 
cgit v1.2.3


From bc5c178cfb3f2ecd606ecb2d1327b869e58f5f57 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 24 Feb 2011 12:33:16 +0100
Subject: bugfix: testbench failed when imptcp was not selected

---
 tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f66270ab..1f0de728 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,6 @@ TESTS = $(TESTRUNS) cfg.sh \
 	rulesetmultiqueue.sh \
 	manytcp.sh \
 	rsf_getenv.sh \
-	manyptcp.sh \
 	imtcp_conndrop.sh \
 	imtcp_addtlframedelim.sh \
 	sndrcv.sh \
@@ -53,6 +52,7 @@ TESTS = $(TESTRUNS) cfg.sh \
 
 if ENABLE_IMPTCP
 TESTS +=  \
+	manyptcp.sh \
 	imptcp_large.sh \
 	imptcp_addtlframedelim.sh \
 	imptcp_conndrop.sh 
-- 
cgit v1.2.3


From 876294adac24792ffc95f075a9b5b79e2b99a1b2 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 24 Feb 2011 14:42:14 +0100
Subject: bugfix: testbench failed when omuxsock was not selected in
 ./configure

---
 tests/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1f0de728..694b28ab 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,7 +36,6 @@ TESTS = $(TESTRUNS) cfg.sh \
 	complex1.sh \
 	queue-persist.sh \
 	pipeaction.sh \
-	uxsock_simple.sh \
 	execonlyonce.sh \
 	execonlywhenprevsuspended.sh \
 	execonlywhenprevsuspended2.sh \
@@ -58,6 +57,10 @@ TESTS +=  \
 	imptcp_conndrop.sh 
 endif
 
+if ENABLE_OMUXSOCK
+TESTS += uxsock_simple.sh
+endif
+
 if ENABLE_OMUDPSPOOF
 TESTS += sndrcv_omudpspoof.sh \
 	 sndrcv_omudpspoof_nonstdpt.sh
-- 
cgit v1.2.3


From dfa88369d4ca4290db56b843f9eabdae1bfe0fd5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 25 Feb 2011 11:05:57 +0100
Subject: bugfix: memory leak when $RepeatedMsgReduction on was used

bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
---
 ChangeLog       | 4 ++++
 runtime/queue.c | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 14723f3d..324fc999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------
+Version 5.6.4  [V5-STABLE] (rgerhards), 2011-02-25
+- bugfix: memory leak when $RepeatedMsgReduction on was used
+  bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
+---------------------------------------------------------------------------
 Version 5.6.3  [V5-STABLE] (rgerhards), 2011-01-26
 - bugfix: action processor released mememory too early, resulting in
   potential issue in retry cases (but very unlikely due to another
diff --git a/runtime/queue.c b/runtime/queue.c
index c2806ca1..ae08c859 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -839,6 +839,7 @@ static rsRetVal qAddDirect(qqueue_t *pThis, void* pUsr)
 {
 	batch_t singleBatch;
 	batch_obj_t batchObj;
+	int i;
 	DEFiRet;
 
 	//TODO: init batchObj (states _OK and new fields -- CHECK)
@@ -860,6 +861,10 @@ static rsRetVal qAddDirect(qqueue_t *pThis, void* pUsr)
 	singleBatch.nElem = 1; /* there always is only one in direct mode */
 	singleBatch.pElem = &batchObj;
 	iRet = pThis->pConsumer(pThis->pUsr, &singleBatch, &pThis->bShutdownImmediate);
+	/* delete the batch string params: TODO: create its own "class" for this */
+	for(i = 0 ; i < CONF_OMOD_NUMSTRINGS_MAXSIZE ; ++i) {
+		free(batchObj.staticActStrings[i]);
+	}
 	objDestruct(pUsr);
 
 	RETiRet;
-- 
cgit v1.2.3


From f46fa5ca003b55702107e170a2868ed0120246c7 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 25 Feb 2011 12:37:03 +0100
Subject: cosmetic: removing commented-out testing aid

---
 tools/syslogd.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/syslogd.c b/tools/syslogd.c
index 574c2efa..f7d71d06 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -699,7 +699,6 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShu
 	assert(pBatch != NULL);
 	pBatch->pbShutdownImmediate = pbShutdownImmediate; /* TODO: move this to batch creation! */
 	preprocessBatch(pBatch);
-//pBatch->bSingleRuleset = 0; // TODO: testing aid, remove!!!!
 	ruleset.ProcessBatch(pBatch);
 //TODO: the BATCH_STATE_COMM must be set somewhere down the road, but we 
 //do not have this yet and so we emulate -- 2010-06-10
-- 
cgit v1.2.3


From 1ef709cc97d54f74d3fdeb83788cc4b01f4c6a2a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 25 Feb 2011 14:14:17 +0100
Subject: bugfix: fixed a memory leak and potential abort condition

this could happen if multiple rulesets were used and some output batches
contained messages belonging to more than one ruleset.
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218
---
 ChangeLog         |  5 +++++
 runtime/batch.h   |  8 +++++++-
 runtime/ruleset.c | 23 ++++++++++++++---------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5596dfbe..c4cb28b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 ---------------------------------------------------------------------------
 Version 5.7.6  [V5-BETA] (rgerhards), 2011-02-??
+- bugfix: fixed a memory leak and potential abort condition
+  this could happen if multiple rulesets were used and some output batches
+  contained messages belonging to more than one ruleset.
+  fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226
+  fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218
 - bugfix: memory leak when $RepeatedMsgReduction on was used
   bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
 ---------------------------------------------------------------------------
diff --git a/runtime/batch.h b/runtime/batch.h
index d0504f2b..944889bd 100644
--- a/runtime/batch.h
+++ b/runtime/batch.h
@@ -136,11 +136,16 @@ batchIsValidElem(batch_t *pBatch, int i) {
 /* copy one batch element to another.
  * This creates a complete duplicate in those cases where
  * it is needed. Use duplication only when absolutely necessary!
+ * Note that all working fields are reset to zeros. If that were 
+ * not done, we would have potential problems with invalid
+ * or double pointer frees.
  * rgerhards, 2010-06-10
  */
 static inline void
 batchCopyElem(batch_obj_t *pDest, batch_obj_t *pSrc) {
-	memcpy(pDest, pSrc, sizeof(batch_obj_t));
+	memset(pDest, 0, sizeof(batch_obj_t));
+	pDest->pUsrp = pSrc->pUsrp;
+	pDest->state = pSrc->state;
 }
 
 
@@ -171,6 +176,7 @@ batchFree(batch_t *pBatch) {
 static inline rsRetVal
 batchInit(batch_t *pBatch, int maxElem) {
 	DEFiRet;
+	pBatch->iDoneUpTo = 0;
 	pBatch->maxElem = maxElem;
 	CHKmalloc(pBatch->pElem = calloc((size_t)maxElem, sizeof(batch_obj_t)));
 	// TODO: replace calloc by inidividual writes?
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
index 0584e8d6..c9c64a38 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -171,35 +171,40 @@ processBatchMultiRuleset(batch_t *pBatch)
 	int i;
 	int iStart;	/* start index of partial batch */
 	int iNew;	/* index for new (temporary) batch */
+	int bHaveUnprocessed;	/* do we (still) have unprocessed entries? (loop term predicate) */
 	DEFiRet;
 
-	CHKiRet(batchInit(&snglRuleBatch, pBatch->nElem));
-	snglRuleBatch.pbShutdownImmediate = pBatch->pbShutdownImmediate;
-
-	while(1) { /* loop broken inside */
+	do {
+		bHaveUnprocessed = 0;
 		/* search for first unprocessed element */
 		for(iStart = 0 ; iStart < pBatch->nElem && pBatch->pElem[iStart].state == BATCH_STATE_DISC ; ++iStart)
 			/* just search, no action */;
-
 		if(iStart == pBatch->nElem)
-			FINALIZE; /* everything processed */
+			break; /* everything processed */
 
 		/* prepare temporary batch */
+		CHKiRet(batchInit(&snglRuleBatch, pBatch->nElem));
+		snglRuleBatch.pbShutdownImmediate = pBatch->pbShutdownImmediate;
 		currRuleset = batchElemGetRuleset(pBatch, iStart);
 		iNew = 0;
 		for(i = iStart ; i < pBatch->nElem ; ++i) {
 			if(batchElemGetRuleset(pBatch, i) == currRuleset) {
-				batchCopyElem(&(snglRuleBatch.pElem[iNew++]), &(pBatch->pElem[i]));
+				/* for performance reasons, we copy only those members that we actually need */
+				snglRuleBatch.pElem[iNew].pUsrp = pBatch->pElem[i].pUsrp;
+				snglRuleBatch.pElem[iNew].state = pBatch->pElem[i].state;
+				++iNew;
 				/* We indicate the element also as done, so it will not be processed again */
 				pBatch->pElem[i].state = BATCH_STATE_DISC;
+			} else {
+				bHaveUnprocessed = 1;
 			}
 		}
 		snglRuleBatch.nElem = iNew; /* was left just right by the for loop */
 		batchSetSingleRuleset(&snglRuleBatch, 1);
 		/* process temp batch */
 		processBatch(&snglRuleBatch);
-	}
-	batchFree(&snglRuleBatch);
+		batchFree(&snglRuleBatch);
+	} while(bHaveUnprocessed == 1);
 
 finalize_it:
 	RETiRet;
-- 
cgit v1.2.3


From 5b1cd3330196c5ffa2b8695798946aa2441b7e84 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 25 Feb 2011 14:43:30 +0100
Subject: preparing for 5.7.6

---
 ChangeLog       | 2 +-
 configure.ac    | 2 +-
 doc/manual.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4cb28b4..0048c280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 5.7.6  [V5-BETA] (rgerhards), 2011-02-??
+Version 5.7.6  [V5-BETA] (rgerhards), 2011-02-25
 - bugfix: fixed a memory leak and potential abort condition
   this could happen if multiple rulesets were used and some output batches
   contained messages belonging to more than one ruleset.
diff --git a/configure.ac b/configure.ac
index aac884e2..09884b9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[5.7.5],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.7.6],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index c8988b1a..966c172d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
 <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
 to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
 project goals.</p>
-<p><b>This documentation is for version 5.7.5 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.7.6 (beta branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might
-- 
cgit v1.2.3