From a71ce0f8b18ed0d8c0503636b8719d7148fb928a Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 7 Jul 2010 12:01:57 +0200 Subject: preparing for 4.6.3 --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbd39fab..7ee6fdbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 4.6.3 [v4-stable] (rgerhards), 2010-04-?? +Version 4.6.3 [v4-stable] (rgerhards), 2010-07-07 - improvded testbench - added test with truly random data received via syslog to test robustness diff --git a/configure.ac b/configure.ac index bfd78281..e41b76f4 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],[4.6.2],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.6.3],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/manual.html b/doc/manual.html index 455a7116..4a292832 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 4.6.2 (v4-stable branch) of rsyslog. +

This documentation is for version 4.6.3 (v4-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit v1.2.3 From 707df8c1618036c09d216f482161e28692d57989 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 7 Jul 2010 12:05:06 +0200 Subject: bumped version number --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7ee6fdbd..bf1a8528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ --------------------------------------------------------------------------- +Version 4.6.4 [v4-stable] (rgerhards), 2010-??-?? +--------------------------------------------------------------------------- Version 4.6.3 [v4-stable] (rgerhards), 2010-07-07 - improvded testbench - added test with truly random data received via syslog to test -- cgit v1.2.3 From 3c1895a699f7d37b49f41f6f758ead4abea0caf2 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 28 Jul 2010 18:20:13 +0200 Subject: bugfix: zero-sized (empty) messages were processed by imtcp they are now dropped as they always should have been --- ChangeLog | 2 ++ tcps_sess.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf1a8528..c98bf42d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 4.6.4 [v4-stable] (rgerhards), 2010-??-?? +- bugfix: zero-sized (empty) messages were processed by imtcp + they are now dropped as they always should have been --------------------------------------------------------------------------- Version 4.6.3 [v4-stable] (rgerhards), 2010-07-07 - improvded testbench diff --git a/tcps_sess.c b/tcps_sess.c index dec14b5a..ea9032b3 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -238,6 +238,11 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG ISOBJ_TYPE_assert(pThis, tcps_sess); + if(pThis->iMsg == 0) { + DBGPRINTF("discarding zero-sized message\n"); + FINALIZE; + } + if(pThis->DoSubmitMessage != NULL) { pThis->DoSubmitMessage(pThis, pThis->pMsg, pThis->iMsg); FINALIZE; @@ -477,8 +482,10 @@ DataRcvd(tcps_sess_t *pThis, char *pData, size_t iLen) CHKiRet(processDataRcvd(pThis, *pData++, &stTime, ttGenTime, &multiSub)); } - /* submit anything that was not yet submitted */ - CHKiRet(multiSubmitMsg(&multiSub)); + if(multiSub.nElem > 0) { + /* submit anything that was not yet submitted */ + CHKiRet(multiSubmitMsg(&multiSub)); + } finalize_it: RETiRet; -- cgit v1.2.3 From f2ec2e9b206b2f8a30417f303017ae0567cbbc0e Mon Sep 17 00:00:00 2001 From: "Kiss Gabor (Bitman)" Date: Thu, 5 Aug 2010 08:25:57 +0200 Subject: program name filter ! in the configuration cannot be reset Signed-off-by: Rainer Gerhards --- ChangeLog | 2 ++ runtime/conf.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb3b01f2..5864d934 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? was random (but most often "on") - bugfix: potential segfault when -p command line option was used thanks to varmojfekoj for pointing me at this bug +- bugfix: programname filter in ! configuration can not be reset + Thanks to Kiss Gabor for the patch. --------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty diff --git a/runtime/conf.c b/runtime/conf.c index ad2f4c15..001b501d 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -985,8 +985,7 @@ static rsRetVal cflineProcessTagSelector(uchar **pline) if(**pline != '\0' && **pline == '*' && *(*pline+1) == '\0') { dbgprintf("resetting programname filter\n"); if(pDfltProgNameCmp != NULL) { - if((iRet = rsCStrSetSzStr(pDfltProgNameCmp, NULL)) != RS_RET_OK) - return(iRet); + rsCStrDestruct(&pDfltProgNameCmp); } } else { dbgprintf("setting programname filter to '%s'\n", *pline); -- cgit v1.2.3