diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | action.c | 2 | ||||
| -rw-r--r-- | doc/imgssapi.html | 5 | ||||
| -rw-r--r-- | runtime/nsd_gtls.c | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -1886,6 +1886,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 @@ -633,7 +633,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/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/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index ad39ccb7..0b1ab4b8 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -113,7 +113,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); |