IST#5469

diff --git a/CHANGES b/CHANGES
index f4816cee4f53f751678baa6689d57571debdc56c..32f2f3ed5cee51daab72005fd593ad2f9d8539e2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,13 +7,14 @@ OpenLDAP 2.4.9 Engineering
        Fixed slapcat error checking (ITS#5387)
        Fixed slapd abstract objectClass inheritance check (ITS#5474)
        Fixed slapd add operations requiring naming attrs (ITS#5412)
-       Fixed slapd frontendDB backend selection (ITS#5419)
+       Fixed slapd connection handling (ITS#5469)
        Fixed slapd delta-syncrepl resync (ITS#5378)
+       Fixed slapd frontendDB backend selection (ITS#5419)
        Fixed slapd pagedresults stale state (ITS#5409)
        Fixed slapd pointer dereference (ITS#5388)
        Fixed slapd null argument dereference (ITS#5435)
-       Fixed slapd sets attribute description parsing (ITS#5402)
        Fixed slapd REP_ENTRY flags (ITS#5340)
+       Fixed slapd sets attribute description parsing (ITS#5402)
        Fixed slapd syncrepl hang on back-config (ITS#5407)
        Fixed slapd syncrepl compare_csns crash (ITS#5413)
        Fixed slapd syncrepl contextCSN update clash (ITS#5426)

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index a42e7ace3faba3c2d7d43cd86460f06b72cd11ad..c4b858dc3b825950879f93c396047466e4d9ae72 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1621,6 +1621,9 @@ connection_resched( Connection *conn )
 {
        Operation *op;
 
+       if( conn->c_writewaiter )
+               return 0;
+
        if( conn->c_conn_state == SLAP_C_CLOSING ) {
                Debug( LDAP_DEBUG_TRACE, "connection_resched: "
                        "attempting closing conn=%lu sd=%d\n",
@@ -1629,7 +1632,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;
        }