Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog

4 files changed, 7 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d718d95..fd5114c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ Version 6.2.1  [v6-stable], 2012-01-??
   http://bugzilla.adiscon.com/show_bug.cgi?id=299
   Thanks to Marcin M for bringing up this problem and Andre Lorbach
   for helping to reproduce and fix it.
+- bugfix/tcpflood: sending small test files did not work correctly
 ---------------------------------------------------------------------------
 Version 6.2.0  [v6-stable], 2012-01-09
 - bugfix (kind of): removed numerical part from pri-text
@@ -272,6 +273,9 @@ Version 5.9.0  [V5-DEVEL] (rgerhards), 2011-03-??
   affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
   closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
 ---------------------------------------------------------------------------
+Version 5.8.12  [V5-stable] 2012-05-??
+- bugfix/tcpflood: sending small test files did not work correctly
+---------------------------------------------------------------------------
 Version 5.8.11  [V5-stable] 2012-05-03
 - bugfix: ommysql did not properly init/exit the mysql runtime library
   this could lead to segfaults. Triggering condition: multiple action
diff --git a/runtime/srUtils.h b/runtime/srUtils.h
index 76d25eb2..3169fd94 100644
--- a/runtime/srUtils.h
+++ b/runtime/srUtils.h
@@ -93,19 +93,6 @@ int getSubString(uchar **ppSrc,  char *pDst, size_t DstSize, char cSep);
 rsRetVal getFileSize(uchar *pszName, off_t *pSize);
 
 /* mutex operations */
-/* some macros to cancel-safe lock a mutex (it will automatically be released
- * when the thread is cancelled. This needs to be done as macros because
- * pthread_cleanup_push sometimes is a macro that can not be used inside a function.
- * It's a bit ugly, but works well... rgerhards, 2008-01-20
- */
-#define	DEFVARS_mutex_cancelsafeLock int iCancelStateSave
-#define mutex_cancelsafe_lock(mut) \
-		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); \
-		d_pthread_mutex_lock(mut); \
-		pthread_cleanup_push(mutexCancelCleanup, mut); \
-		pthread_setcancelstate(iCancelStateSave, NULL);
-#define mutex_cancelsafe_unlock(mut) pthread_cleanup_pop(1)
-
 /* some useful constants */
 #define DEFVARS_mutexProtection\
 	int bLockedOpIsLocked=0
diff --git a/tests/tcpflood.c b/tests/tcpflood.c
index 8485acbb..64d95abd 100644
--- a/tests/tcpflood.c
+++ b/tests/tcpflood.c
@@ -346,7 +346,7 @@ genMsg(char *buf, size_t maxBuf, int *pLenBuf, struct instdata *inst)
 		do {
 			done = 1;
 			*pLenBuf = fread(buf, 1, 1024, dataFP);
-			if(feof(dataFP)) {
+			if(*pLenBuf == 0) {
 				if(--numFileIterations > 0)  {
 					rewind(dataFP);
 					done = 0; /* need new iteration */
@@ -660,7 +660,7 @@ runTests(void)
 	int run;
 
 	stats.totalRuntime = 0;
-	stats.minRuntime = (unsigned long long) 0xffffffffffffffffll;
+	stats.minRuntime = 0xffffffffllu;
 	stats.maxRuntime = 0;
 	stats.numRuns = numRuns;
 	run = 1;
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 9f8c88f4..84fe8453 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2401,7 +2401,7 @@ queryLocalHostname(void)
 	}
 
 	/* LocalDomain is "" or part of LocalHostName, allocate a new string */
-	CHKmalloc(LocalDomain = (uchar*)strdup(LocalDomain));
+	CHKmalloc(LocalDomain = (uchar*)strdup((char*)LocalDomain));
 
 	/* Convert to lower case to recognize the correct domain laterly */
 	for(p = LocalDomain ; *p ; p++)