From eb53400b636344f5345ea9bbc1b11cc21d220456 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 21 Apr 2008 20:51:10 +0000 Subject: [PATCH] IST#5469 --- CHANGES | 5 +++-- servers/slapd/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index f4816cee4f..32f2f3ed5c 100644 --- 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 a42e7ace3f..c4b858dc3b 100644 --- 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; } -- 2.39.5