]> git.sur5r.net Git - openldap/commitdiff
Revert prev commit
authorHoward Chu <hyc@openldap.org>
Tue, 13 Jan 2009 00:08:36 +0000 (00:08 +0000)
committerHoward Chu <hyc@openldap.org>
Tue, 13 Jan 2009 00:08:36 +0000 (00:08 +0000)
servers/slapd/connection.c

index e15a84339b151734be4ae24b8f66555af9052f86..98a2432c5fffd8ba926cf9c457a1ccecbbcf1e1a 100644 (file)
@@ -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;
        }