ITS#3802, #3999 skip wake_sds in epoll event loop

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index e161af4513b2f52638096d90708c8f621ad6df90..a0125a19fc1248ba7f919d56d4112b8515d75805 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1918,6 +1918,10 @@ slapd_daemon_task(
 #endif
                         ) continue;
 
+                       /* Don't log internal wake events */
+                       if ( SLAP_EVENT_FD( i ) == wake_sds[0] )
+                               continue;
+
                        r = SLAP_EVENT_IS_READ( i );
                        w = SLAP_EVENT_IS_WRITE( i );
                        if ( r || w ) {
@@ -1939,6 +1943,10 @@ slapd_daemon_task(
                        if ( rc ) {
                                fd = SLAP_EVENT_FD( i );
 
+                               /* Ignore wake events, they were handled above */
+                               if ( fd == wake_sds[0] )
+                                       continue;
+
                                if( SLAP_EVENT_IS_WRITE( i ) ) {
                                        Debug( LDAP_DEBUG_CONNS,
                                                "daemon: write active on %d\n",