diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-19 11:20:59 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-19 11:20:59 +0100 |
commit | 6bcc1e371b8c27b227a7c87f475063f7fddfd44f (patch) | |
tree | 0941df531236de6a65b5ddaf02a07020fdc11a97 | |
parent | be2383f2b80d4fb83abd2765e6467e8d7614ab49 (diff) | |
parent | 5fe837bf7dbdcc245ee233feb1fbcc6d052a4898 (diff) | |
download | rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.gz rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.xz rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.zip |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
action.c
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | action.c | 2 | ||||
-rw-r--r-- | doc/imfile.html | 4 | ||||
-rw-r--r-- | doc/imgssapi.html | 5 | ||||
-rw-r--r-- | doc/omprog.html | 43 | ||||
-rw-r--r-- | doc/rsyslog_conf_modules.html | 1 | ||||
-rw-r--r-- | plugins/omgssapi/omgssapi.c | 4 | ||||
-rw-r--r-- | runtime/nsd_gtls.c | 10 |
8 files changed, 73 insertions, 12 deletions
@@ -105,6 +105,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- +Version 5.8.7 [V5-stable] 2011-??-?? +- bugfix: potential abort after reading invalid X.509 certificate + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 + Thanks to Tomas Heinrich for the patch +--------------------------------------------------------------------------- Version 5.8.6 [V5-stable] 2011-10-21 - bugfix: missing whitespace after property-based filter was not detected - bugfix: $OMFileFlushInterval period was doubled - now using correct value @@ -946,12 +951,18 @@ increase. - increased ompgsql performance by adapting to new transactional output module interface --------------------------------------------------------------------------- -Version 4.8.1 [v4-beta], 2011-09-?? +Version 4.8.1 [v4-stable], 2011-09-?? - bugfix: $ActionExecOnlyOnce interval did not work properly Thanks to Tomas Heinrich for the patch - bugfix: potential abort if ultra-large file io buffers are used and dynafile cache exhausts address space (primarily a problem on 32 bit platforms) +- bugfix: potential abort after reading invalid X.509 certificate + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 + Thanks to Tomas Heinrich for the patch. +- bugfix: potential fatal abort in omgssapi + Thanks to Tomas Heinrich for the patch. +- added doc for omprog --------------------------------------------------------------------------- Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07 *************************************************************************** @@ -1741,6 +1752,9 @@ version before switching to this one. Thanks to Ken for providing the patch --------------------------------------------------------------------------- Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? +- bugfix: action resume interval incorrectly handled, thus took longer to + resume +- bugfix: cosmetic: proper constant used instead of number in open call - bugfix: timestamp was incorrectly calculated for timezones with minute offset closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 @@ -660,7 +660,7 @@ static rsRetVal actionTryResume(action_t *pThis, int *pbShutdownImmediate) * here. -- rgerhards, 2009-03-18 */ datetime.GetTime(&ttNow); /* cache "now" */ - if(ttNow > pThis->ttResumeRtry) { + if(ttNow >= pThis->ttResumeRtry) { actionSetState(pThis, ACT_STATE_RTRY); /* back to retries */ } } diff --git a/doc/imfile.html b/doc/imfile.html index 60bbbeea..7961729b 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -15,7 +15,9 @@ text file is a file consisting of printable characters with lines being delimited by LF.</p> <p>The file is read line-by-line and any line read is passed to rsyslog's rule engine. The rule engine applies filter conditons and -selects which actions needs to be carried out.</p> +selects which actions needs to be carried out. Empty lines are <b>not</b> +processed, as they would result in empty syslog records. They are simply +ignored.</p> <p>As new lines are written they are taken from the file and processed. Please note that this happens based on a polling interval and not immediately. The file monitor support file rotation. To fully diff --git a/doc/imgssapi.html b/doc/imgssapi.html index ec183fe7..dd90fec7 100644 --- a/doc/imgssapi.html +++ b/doc/imgssapi.html @@ -38,7 +38,7 @@ Sets the maximum number of sessions supported</li> <p>This sets up a GSS server on port 1514 that also permits to receive plain tcp syslog messages (on the same port):<br> </p> -<textarea rows="15" cols="60">$ModLoad imtcp # needs to be done just once +<textarea rows="15" cols="60">$ModLoad imgssapi # needs to be done just once $InputGSSServerRun 1514 $InputGSSServerPermitPlainTCP on </textarea> @@ -47,8 +47,7 @@ $InputGSSServerPermitPlainTCP on <p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> project.<br> -Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer -Gerhards</a> and +Copyright © 2008-2011 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL version 3 or higher.</font></p> </body></html> diff --git a/doc/omprog.html b/doc/omprog.html new file mode 100644 index 00000000..471ab224 --- /dev/null +++ b/doc/omprog.html @@ -0,0 +1,43 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html><head><title>omprog output module - sending messages to a program</title> +<a href="features.html">back</a> +</head> +<body> +<h1>Program integration Output module</h1> +<p><b>Module Name: omprog</b></p> +<p><b>Available since: </b> 4.3.0</p> +<p><b>Author: </b>Rainer Gerhards +<rgerhards@adiscon.com></p> +<p><b>Description</b>:</p> +<p>This module permits to integrate arbitrary external programs into rsyslog's +logging. It is similar to the "execute program (^)" action, but offers better security +and much higher performance. While "execute program (^)" can be a useful tool for +executing programs if rare events occur, omprog can be used to provide massive +amounts of log data to a program. +<p>Executes the configured program and feeds log messages to that binary via +stdin. The binary is free to do whatever it wants with the supplied data. +If the program terminates, it is re-started. If rsyslog terminates, the +program's stdin will see EOF. The program must than terminate. The message format +passed to the program can, as usual, be modified by defining rsyslog templates. +<p>Note that each time an omprog action is defined, the corresponding programm +is invoked. A single instance is <b>not</b> being re-used. There are arguments pro and +con re-using existing binaries. For the time being, it simply is not done. In the future, +we may add an option for such pooling, provided that some demand for that is voiced. +You can also mimic the same effect by defining multiple rulesets and including them (at +the price of some slight performance loss). +<p><b>Configuration Directives</b>:</p> +<ul> +<li><b>$ActionOMProgBinary</b> <binary><br> +The binary program to be executed. +</ul> +<b>Caveats/Known Bugs:</b> +<p>Currently none known. +<p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] +[<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> +<p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> +project.<br> +Copyright © 2008-2011 by <a href="http://www.gerhards.net/rainer">Rainer +Gerhards</a> and +<a href="http://www.adiscon.com/">Adiscon</a>. +Released under the GNU GPL version 3 or higher.</font></p> +</body></html> diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html index b03313f5..9fa35ccd 100644 --- a/doc/rsyslog_conf_modules.html +++ b/doc/rsyslog_conf_modules.html @@ -63,6 +63,7 @@ generic database output module (Firebird/Interbase, MS SQL, Sybase, SQLLite, Ingres, Oracle, mSQL)</li> <li><a href="ommail.html">ommail</a> - permits rsyslog to alert folks by mail if something important happens</li> +<li><a href="omprog.html">omprog</a> - permits sending messages to a program for custom processing</li> <li><a href="omoracle.html">omoracle</a> - output module for Oracle (native OCI interface)</li> <li><a href="omudpspoof.html">omudpspoof</a> - output module sending UDP syslog messages with a spoofed address</li> <li><a href="omuxsock.html">omuxsock</a> - output module Unix domain sockets</li> diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c index e4fdf0c0..21c540b7 100644 --- a/plugins/omgssapi/omgssapi.c +++ b/plugins/omgssapi/omgssapi.c @@ -362,9 +362,7 @@ static rsRetVal doTryResume(instanceData *pData) } break; case eDestFORW: - /* rgerhards, 2007-09-11: this can not happen, but I've included it to - * a) make the compiler happy, b) detect any logic errors */ - assert(0); + /* NOOP */ break; } diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index 15340738..e1192aaf 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -119,7 +119,7 @@ readFile(uchar *pszFile, gnutls_datum_t *pBuf) pBuf->data = NULL; - if((fd = open((char*)pszFile, 0)) == -1) { + if((fd = open((char*)pszFile, O_RDONLY)) == -1) { errmsg.LogError(0, RS_RET_FILE_NOT_FOUND, "can not read file '%s'", pszFile); ABORT_FINALIZE(RS_RET_FILE_NOT_FOUND); @@ -208,10 +208,14 @@ finalize_it: if(iRet != RS_RET_OK) { if(data.data != NULL) free(data.data); - if(pThis->bOurCertIsInit) + if(pThis->bOurCertIsInit) { gnutls_x509_crt_deinit(pThis->ourCert); - if(pThis->bOurKeyIsInit) + pThis->bOurCertIsInit = 0; + } + if(pThis->bOurKeyIsInit) { gnutls_x509_privkey_deinit(pThis->ourKey); + pThis->bOurKeyIsInit = 0; + } } RETiRet; } |