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 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 From 58924bd011a46000a933933037e5db795ad6708f Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 28 Jul 2010 14:38:51 +0200 Subject: rsyslog status is now a web site only ressource and in a sense has already been -- the file was not distributed for quite some while, I just kept it for convenience in git. --- doc/index.html | 2 +- doc/manual.html | 2 +- doc/status.html | 70 --------------------------------------------------------- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 doc/status.html diff --git a/doc/index.html b/doc/index.html index b3b336a7..d753e2ed 100644 --- a/doc/index.html +++ b/doc/index.html @@ -13,7 +13,7 @@ installed documentation which exactly matches the version you have installed. It is highly suggested to at least briefly look over these files.

  • The rsyslog web site which offers probably every information you'll ever need (ok, just kidding...). -
  • The project status page provides +
  • The project status page provides information on current releases
  • and the troubleshooting guide hopefully helps if things do not immediately work out diff --git a/doc/manual.html b/doc/manual.html index 99e44fc2..fb6fed5d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -20,7 +20,7 @@ rsyslog support available directly from the source!

    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 5.5.6 (devel branch) of rsyslog. -Visit the rsyslog status page +Visit the rsyslog status page to obtain current version information and project status.

    If you like rsyslog, you might want to lend us a helping hand. It doesn't require a lot of diff --git a/doc/status.html b/doc/status.html deleted file mode 100644 index 6c183868..00000000 --- a/doc/status.html +++ /dev/null @@ -1,70 +0,0 @@ - -rsyslog status page - -

    rsyslog status page

    -

    This page reflects the status as of 2010-05-20.

    -

    Current Releases

    - -

    development: 5.5.5 [2010-05-20] - -change log - -download -
    -v4 development: 4.7.2 [2010-05-03] - -change log - -download

    - - - -

    v5 stable: 5.4.0 [2010-03-08] - -change log - -download - -
    v4 stable: 4.6.2 [2010-03-26] - -change log - -download - -
    v3 stable: 3.22.1 [2009-07-02] - -change log - -download - -
    v2 stable: 2.0.7 [2009-04-14] - change log - -download -
    v0 to v2 are deprecated and no longer supported. If you absolutely do not like to -upgrade, you may consider purchasing a -commercial rsyslog support package. Just let us point -out that it is really not a good idea to still run a v0 version. - -

    If you updgrade from version 2, be sure to read the rsyslog v3 -compatibility document. There are no additional compatibility concerns at this time for -upgrading from v3 to v4. If some occur, we will post an additional compatiblity document.

    -

    (How are versions named?)

    - -

    Platforms

    -

    Thankfully, a number of folks have begin to build packages and -help port rsyslog to other platforms. As such, -the -platform list is now maintained inside the rsyslog wiki. -Platform maintainers perhaps have posted extra information there. If -you do platform-specific work, feel free to add information to the wiki.

    -

    Rsyslog is the default syslogd on almost all modern Linuxes. -It is also available under BSD and Sun Solaris.

    -

    Additional information

    -

    Currently supported features are listed on the rsyslog features page.

    - -

    The project was initiated in 2003 and seriouosly begun in 2004 by -Rainer Gerhards -and is currently being maintained by him. See the history page for more -background information.

    - -- cgit 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 From 676939f61671f96e80323cf929ee506f3844fcfc Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 5 Aug 2010 07:48:36 +0200 Subject: break potential infinite loop in actionDoRetry If a module always returns RS_RET_OK (like ompipe does) the actionDoRetry loop may not have leaved faked ACT_STATE_SUSP state in case iResumeOKinRow had ever reached a count of 1000. Signed-off-by: Rainer Gerhards --- action.c | 1 + 1 file changed, 1 insertion(+) diff --git a/action.c b/action.c index 32a07dcb..90ec1bf0 100644 --- a/action.c +++ b/action.c @@ -508,6 +508,7 @@ static rsRetVal actionDoRetry(action_t *pThis, time_t ttNow) iRet = pThis->pMod->tryResume(pThis->pModData); if((pThis->iResumeOKinRow > 999) && (pThis->iResumeOKinRow % 1000 == 0)) { bTreatOKasSusp = 1; + pThis->iResumeOKinRow = 0; } else { bTreatOKasSusp = 0; } -- cgit 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