Merge branch 'v4-stable' into v5-stable

Conflicts:
	action.c

ChangeLog

@@ -1642,6 +1642,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

action.c

@@ -627,7 +627,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 */
 		}
 	}

runtime/nsd_gtls.c

@@ -115,7 +115,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);