accept errors not printed any more.

git-svn-id: file:///svn/unbound/trunk@1370 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 9c78233e64ea272c7b2858804dcb9350cce8b3fb..4f9a0b99133a5224c42b7fec5c16a8ca78b870c6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 November 2008: Wouter
+       - fixed tcp accept, errors were printed when they should not.
+
 20 November 2008: Wouter
        - fixup fatal error due to faulty error checking after tcp accept.
        - add check in rlimit to avoid integer underflow.

diff --git a/util/netevent.c b/util/netevent.c
index 056183656ecee7e4e92d4ffae35f5553c70ef7a0..b6038d5f585a8dc1559d7ac6f3fe2e15e202ed84 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -554,15 +554,15 @@ int comm_point_perform_accept(struct comm_point* c,
        if(new_fd == -1) {
 #ifndef USE_WINSOCK
                /* EINTR is signal interrupt. others are closed connection. */
-               if(     errno != EINTR 
+               if(     errno == EINTR || errno == EAGAIN
 #ifdef EWOULDBLOCK
-                       && errno != EWOULDBLOCK 
+                       || errno == EWOULDBLOCK 
 #endif
 #ifdef ECONNABORTED
-                       && errno != ECONNABORTED 
+                       || errno == ECONNABORTED 
 #endif
 #ifdef EPROTO
-                       && errno != EPROTO
+                       || errno == EPROTO
 #endif /* EPROTO */
                        )
                        return -1;