Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
	runtime/ruleset.c
	template.h
	threads.c
	tools/syslogd.c

1 files changed, 1 insertions, 1 deletions

diff --git a/tcpsrv.c b/tcpsrv.c
index e5fe0d71..1f4dcb81 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -870,7 +870,7 @@ Run(tcpsrv_t *pThis)
 	dbgprintf("tcpsrv uses epoll() interface, nsdpoll driver found\n");
 
 	/* flag that we are in epoll mode */
-	pThis->bUsingEPoll = TRUE;
+	pThis->bUsingEPoll = RSTRUE;
 
 	/* Add the TCP listen sockets to the list of sockets to monitor */
 	for(i = 0 ; i < pThis->iLstnCurr ; ++i) {