From ffa6e3b9419e8794d6bba8a0ce5ade65cdcc9ccb Mon Sep 17 00:00:00 2001 From: Tomas Heinrich Date: Thu, 1 Dec 2011 11:18:49 +0100 Subject: bugfix: cosmetic: proper constant used instead of number in open call Signed-off-by: Rainer Gerhards --- ChangeLog | 1 + runtime/nsd_gtls.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2494a86b..d5f31a08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ --------------------------------------------------------------------------- Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? +- 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 diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index 3a79a015..31e1e964 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -110,7 +110,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); -- cgit From 9859818eccb27a330537258d9149c7c5f32292f6 Mon Sep 17 00:00:00 2001 From: Tomas Heinrich Date: Thu, 1 Dec 2011 11:25:47 +0100 Subject: bugfix: action resume interval incorrectly handled, thus took longer to resume Signed-off-by: Rainer Gerhards --- ChangeLog | 4 +++- action.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5f31a08..cc718141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ --------------------------------------------------------------------------- Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? -- bugfix: cosmetic proper constant used instead of number in open call +- 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 diff --git a/action.c b/action.c index 5c5bdbe9..c071bd4b 100644 --- a/action.c +++ b/action.c @@ -355,7 +355,7 @@ static rsRetVal actionTryResume(action_t *pThis) ttNow = getActNow(pThis); /* cache "now" */ /* first check if it is time for a re-try */ - if(ttNow > pThis->ttResumeRtry) { + if(ttNow >= pThis->ttResumeRtry) { iRet = pThis->pMod->tryResume(pThis->pModData); if(iRet == RS_RET_SUSPENDED) { /* set new tryResume time */ -- cgit