summaryrefslogtreecommitdiffstats
path: root/tcpsrv.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-25 12:19:56 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-25 12:19:56 +0200
commitde71589ca3145dfbe8e34790bb49e3d86d3d3bce (patch)
tree43a91ec3d4c7306c9ddda820b916e8da71b3d065 /tcpsrv.c
parent2f4292a81c2bf89b349f0e276c69616ac6e51164 (diff)
parent8939ccfffd3a0580ead376234ad64a9602d4e4e6 (diff)
downloadrsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.gz
rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.bz2
rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.zip
Merge branch 'v6-stable'
Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
Diffstat (limited to 'tcpsrv.c')
-rw-r--r--tcpsrv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tcpsrv.c b/tcpsrv.c
index 65c24160..bf12f1fa 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -869,7 +869,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) {