From 05752bea50e1bcca485aad61ca4a291cc6e01b7c Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 21 Apr 2008 20:51:48 +0000 Subject: [PATCH] ITS#5469 --- CHANGES | 1 + servers/slapd/connection.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index b94953eb67..930463dcb5 100644 --- 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 199fc3028c..742934113b 100644 --- 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; } -- 2.47.2