ITS#5469

diff --git a/CHANGES b/CHANGES
index b94953eb678f0158da75ccbaf548312812dfe27d..930463dcb5d76605a634c25ce61277399c145f4d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.42 Engineering
        Fixed slapd abstract objectClass inheritance check (ITS#5474)
+       Fixed slapd connection handling (ITS#5469)
        Fixed slapd delta-syncrepl refresh mode (ITS#5376)
        Fixed slapd delta-syncrepl resync (ITS#5378)
        Fixed slapd pagedresults stale state (ITS#5409)

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 199fc3028cb0cc80844176dbef34ec1742b133f4..742934113b1af7441130a5b5c0c401f01c2db79b 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1712,6 +1712,9 @@ connection_resched( Connection *conn )
 {
        Operation *op;
 
+       if( conn->c_writewaiter )
+               return 0;
+
        if( conn->c_conn_state == SLAP_C_CLOSING ) {
                ber_socket_t    sd;
                ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
@@ -1723,7 +1726,7 @@ connection_resched( Connection *conn )
                return 0;
        }
 
-       if( conn->c_conn_state != SLAP_C_ACTIVE || conn->c_writewaiter ) {
+       if( conn->c_conn_state != SLAP_C_ACTIVE ) {
                /* other states need different handling */
                return 0;
        }