From: Howard Chu <hyc@openldap.org>
Date: Tue, 13 Jan 2009 00:08:36 +0000 (+0000)
Subject: Revert prev commit
X-Git-Tag: ACLCHECK_0~1011
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f54bb377dfc20720eaa89be824602f1b8f9c523b;p=openldap

Revert prev commit
---

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index e15a84339b..98a2432c5f 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1132,13 +1132,10 @@ operations_error:
 		/* c_mutex is locked */
 		connection_closing( conn,
 			tag == LDAP_REQ_UNBIND ? NULL : "operations error" );
-		connection_close( conn );
-		break;
-	default:
-		connection_resched( conn );
 		break;
 	}
 
+	connection_resched( conn );
 	ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 	slap_op_free( op, ctx );
 	return NULL;
@@ -1636,6 +1633,10 @@ connection_resched( Connection *conn )
 		return 0;
 
 	if( conn->c_conn_state == SLAP_C_CLOSING ) {
+		Debug( LDAP_DEBUG_CONNS, "connection_resched: "
+			"attempting closing conn=%lu sd=%d\n",
+			conn->c_connid, conn->c_sd, 0 );
+		connection_close( conn );
 		return 0;
 	}