about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2008-04-03 14:17:42 +0000
committerFlorian Westphal <fw@strlen.de>2008-04-03 23:20:22 +0200
commit66e68de16a2c174811cf161654b734a9254456c5 (patch)
tree232822b7ef98915ab1ffba8af3e49325b61114be /src
parent7f44a2ad1c8e6c28b6d7f384a3af9da12e22fcab (diff)
downloadngircd-66e68de16a2c174811cf161654b734a9254456c5.tar.gz
ngircd-66e68de16a2c174811cf161654b734a9254456c5.zip
io.c: fix select FD_SETSIZE check when using epoll as io backend
Diffstat (limited to 'src')
-rw-r--r--src/ngircd/io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ngircd/io.c b/src/ngircd/io.c
index 34066b2b..8b8132a1 100644
--- a/src/ngircd/io.c
+++ b/src/ngircd/io.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: io.c,v 1.29 2008/03/27 15:47:21 fw Exp $";
+static char UNUSED id[] = "$Id: io.c,v 1.30 2008/04/03 14:17:42 fw Exp $";
 
 #include <assert.h>
 #include <stdlib.h>
@@ -707,7 +707,7 @@ io_event_create(int fd, short what, void (*cbfunc) (int, short))
 
 	assert(fd >= 0);
 #if defined(IO_USE_SELECT) && defined(FD_SETSIZE)
-	if (fd >= FD_SETSIZE) {
+	if (io_masterfd < 0 && fd >= FD_SETSIZE) {
 		Log(LOG_ERR,
 		    "fd %d exceeds FD_SETSIZE (%u) (select can't handle more file descriptors)",
 		    fd, FD_SETSIZE);