Backout the input exhaustion change, it loops. Still looking for

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 3094ee77a1de26146aa48e5959e7647673984855..a007fa1f5e8976536ee454fd65abd419820ceae4 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -845,7 +845,7 @@ slapd_daemon_task(
 #endif
 
                        for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-                               if ( i == slap_listeners[l]->sl_sd ) {
+                               if ( rd == slap_listeners[l]->sl_sd ) {
                                        is_listener = 1;
                                        break;
                                }
@@ -864,9 +864,7 @@ slapd_daemon_task(
                         * active.
                         */
 
-                       while ( ( rc = connection_read( rd ) ) > 0 )
-                               ;
-                       if ( rc < 0 ) {
+                       if ( connection_read( rd ) < 0 ) {
                                slapd_close( rd );
                        }
                }