From 911e2ec374d9911804eebf4765911654610384a0 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Sep 2012 07:43:04 +0200 Subject: doc: add new functions to RainerScript function list --- doc/rainerscript.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/rainerscript.html b/doc/rainerscript.html index 63a79040..fcc2674d 100644 --- a/doc/rainerscript.html +++ b/doc/rainerscript.html @@ -58,6 +58,9 @@ recommended. variable, if it exists. Returns an empty string if it does not exist.
  • strlen(str) - returns the length of the provided string
  • tolower(str) - converts the provided string into lowercase +
  • cstr(expr) - converts expr to a string value +
  • cnum(expr) - converts expr to a number (integer) +
  • re_match(expr, re) - returns 1, if expr matches re, 0 otherwise

    The following example can be used to build a dynamic filter based on some environment variable: @@ -69,7 +72,7 @@ if $msg contains getenv('TRIGGERVAR') then /path/to/errfile

    This documentation is part of the rsyslog project.
    -Copyright © 2008, 2009 by Rainer Gerhards and +Copyright © 2008-2012 by Rainer Gerhards and Adiscon. Released under the GNU GPL version 3 or higher.

    -- cgit v1.2.3 From 0b7d60132026fea49383eac57fa732f974934371 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Sep 2012 08:02:51 +0200 Subject: bugfix: small memory leak in imdiag This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail. --- plugins/imdiag/imdiag.c | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/imdiag/imdiag.c b/plugins/imdiag/imdiag.c index 6ea615a1..09742537 100644 --- a/plugins/imdiag/imdiag.c +++ b/plugins/imdiag/imdiag.c @@ -390,6 +390,7 @@ finalize_it: if(pOurTcpsrv != NULL) tcpsrv.Destruct(&pOurTcpsrv); } + free(pNewVal); RETiRet; } -- cgit v1.2.3 From bbfb5662dae6c863e1022153b765046cd17b088b Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Sep 2012 08:17:58 +0200 Subject: testbench: do not run tests requiring root privs if non-root --- tests/sndrcv_omudpspoof.sh | 4 ++++ tests/sndrcv_omudpspoof_nonstdpt.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tests/sndrcv_omudpspoof.sh b/tests/sndrcv_omudpspoof.sh index bb804d93..cb1c2497 100755 --- a/tests/sndrcv_omudpspoof.sh +++ b/tests/sndrcv_omudpspoof.sh @@ -7,4 +7,8 @@ # This file is part of the rsyslog project, released under GPLv3 echo =============================================================================== echo \[sndrcv_omudpspoof.sh\]: testing sending and receiving via omudp +echo This test must be run as root [raw socket access required] +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/sndrcv_drvr.sh sndrcv_omudpspoof 50 diff --git a/tests/sndrcv_omudpspoof_nonstdpt.sh b/tests/sndrcv_omudpspoof_nonstdpt.sh index 6aeb1a5f..ddd3eb7e 100755 --- a/tests/sndrcv_omudpspoof_nonstdpt.sh +++ b/tests/sndrcv_omudpspoof_nonstdpt.sh @@ -7,4 +7,8 @@ # This file is part of the rsyslog project, released under GPLv3 echo =============================================================================== echo \[sndrcv_omudpspoof_nonstdpt.sh\]: testing sending and receiving via omudp +echo This test must be run as root [raw socket access required] +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/sndrcv_drvr.sh sndrcv_omudpspoof_nonstdpt 50 -- cgit v1.2.3 From c0e35e864aebef9de367f736e8b73a3f3753c7f9 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Sep 2012 08:31:03 +0200 Subject: bugfix: config validation run did not always return correct return state --- ChangeLog | 1 + tools/syslogd.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3e840726..8504f1a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ Version 6.5.1 [devel] 2012-08-?? - bugfix: small memory leaks in template() statements these were one-time memory leaks during startup, so they did NOT grow during runtime +- bugfix: config validation run did not always return correct return state --------------------------------------------------------------------------- Version 6.5.0 [devel] 2012-08-28 - imrelp now supports non-cancel thread termination diff --git a/tools/syslogd.c b/tools/syslogd.c index 219b41ab..152c27ae 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2108,6 +2108,7 @@ finalize_it: } else if(iRet != RS_RET_OK) { fprintf(stderr, "rsyslogd: run failed with error %d (see rsyslog.h " "or try http://www.rsyslog.com/e/%d to learn what that number means)\n", iRet, iRet*-1); + exit(1); } ENDfunc -- cgit v1.2.3 From 762c1a81d5ee669091c7b5b20453f4968acd21c2 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Sep 2012 08:41:32 +0200 Subject: bugfix: config validation run did not always return correct return state --- ChangeLog | 1 + tools/syslogd.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index e5cc879c..2823669f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Version 6.4.2 [V6-STABLE] 2012-09-?? used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later. +- bugfix: config validation run did not always return correct return state --------------------------------------------------------------------------- Version 6.4.1 [V6-STABLE] 2012-09-06 - bugfix: multiple main queues with same queue file name were not detected diff --git a/tools/syslogd.c b/tools/syslogd.c index 81150677..5064511d 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2132,6 +2132,7 @@ finalize_it: } else if(iRet != RS_RET_OK) { fprintf(stderr, "rsyslogd: run failed with error %d (see rsyslog.h " "or try http://www.rsyslog.com/e/%d to learn what that number means)\n", iRet, iRet*-1); + exit(1); } ENDfunc -- cgit v1.2.3 From 5cd44ee4383ec813b6d34783a6a2f62af2930ab6 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Sep 2012 08:17:58 +0200 Subject: testbench: do not run tests requiring root privs if non-root --- tests/sndrcv_omudpspoof.sh | 4 ++++ tests/sndrcv_omudpspoof_nonstdpt.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tests/sndrcv_omudpspoof.sh b/tests/sndrcv_omudpspoof.sh index bb804d93..cb1c2497 100755 --- a/tests/sndrcv_omudpspoof.sh +++ b/tests/sndrcv_omudpspoof.sh @@ -7,4 +7,8 @@ # This file is part of the rsyslog project, released under GPLv3 echo =============================================================================== echo \[sndrcv_omudpspoof.sh\]: testing sending and receiving via omudp +echo This test must be run as root [raw socket access required] +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/sndrcv_drvr.sh sndrcv_omudpspoof 50 diff --git a/tests/sndrcv_omudpspoof_nonstdpt.sh b/tests/sndrcv_omudpspoof_nonstdpt.sh index 6aeb1a5f..ddd3eb7e 100755 --- a/tests/sndrcv_omudpspoof_nonstdpt.sh +++ b/tests/sndrcv_omudpspoof_nonstdpt.sh @@ -7,4 +7,8 @@ # This file is part of the rsyslog project, released under GPLv3 echo =============================================================================== echo \[sndrcv_omudpspoof_nonstdpt.sh\]: testing sending and receiving via omudp +echo This test must be run as root [raw socket access required] +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/sndrcv_drvr.sh sndrcv_omudpspoof_nonstdpt 50 -- cgit v1.2.3 From e99ca8246fee02bb7f713f31527f2377a5d2dd5c Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Sep 2012 09:39:42 +0200 Subject: preparing for 6.4.2 release --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- plugins/cust1/cust1.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 plugins/cust1/cust1.c diff --git a/ChangeLog b/ChangeLog index 2823669f..fc6cfc68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 6.4.2 [V6-STABLE] 2012-09-?? +Version 6.4.2 [V6-STABLE] 2012-09-20 - bugfix: potential abort, if action queue could not be properly started This most importantly could happen due to configuration errors. - bugfix: remove invalid socket option call from imuxsock diff --git a/configure.ac b/configure.ac index 5d419b12..b57aabf0 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],[6.4.1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.4.2],[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 de0319f8..1114b9e2 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 6.4.1 (stable branch) of rsyslog. +

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

    If you like rsyslog, you might diff --git a/plugins/cust1/cust1.c b/plugins/cust1/cust1.c new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3