allow empty modlist

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 71d6a35b5737bff7f6902429735d9e8ad614a883..46c28dfc1e358f0e71928b5f577f952614cfd2ab 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -437,8 +437,6 @@ static Connection* connection_get( ber_socket_t s )
        assert( MCA_conn_check( s ) );
        c = MCA_GET_CONNECTION(s);
 
-       assert( c->c_struct_state != SLAP_C_UNINITIALIZED );
-
 #else
        c = NULL;
        {
@@ -475,6 +473,8 @@ static Connection* connection_get( ber_socket_t s )
        if( c != NULL ) {
                ber_socket_t    sd;
 
+               assert( c->c_struct_state != SLAP_C_UNINITIALIZED );
+
                ldap_pvt_thread_mutex_lock( &c->c_mutex );
 
                ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
@@ -1075,7 +1075,7 @@ Connection* connection_next( Connection *c, ber_socket_t *index )
 
        assert( connections != NULL );
        assert( index != NULL );
-       assert( *index >= 0 && *index < MCA_ARRAY_SIZE );
+       assert( *index >= 0 && *index <= dtblsize );
 
        if( c != NULL ) ldap_pvt_thread_mutex_unlock( &c->c_mutex );
 
@@ -1268,6 +1268,20 @@ connection_operation( void *ctx, void *arg_v )
                goto operations_error;
        }
 
+#ifdef LDAP_X_TXN
+       if (( conn->c_txn == CONN_TXN_SPECIFY ) && (
+               ( tag == LDAP_REQ_ADD ) ||
+               ( tag == LDAP_REQ_DELETE ) ||
+               ( tag == LDAP_REQ_MODIFY ) ||
+               ( tag == LDAP_REQ_MODRDN )))
+       {
+               /* Disable SLAB allocator for all update operations
+                       issued inside of a transaction */
+               op->o_tmpmemctx = NULL;
+               op->o_tmpmfuncs = &ch_mfuncs;
+       } else
+#endif
+       {
        /* We can use Thread-Local storage for most mallocs. We can
         * also use TL for ber parsing, but not on Add or Modify.
         */
@@ -1287,6 +1301,7 @@ connection_operation( void *ctx, void *arg_v )
                 */
                ber_set_option( op->o_ber, LBER_OPT_BER_MEMCTX, &memctx );
        }
+       }
 
        switch ( tag ) {
        case LDAP_REQ_BIND:
@@ -2027,10 +2042,15 @@ connection_init_log_prefix( Operation *op )
        }
 }
 
-static int connection_bind_cb( Operation *op, SlapReply *rs )
+static int connection_bind_cleanup_cb( Operation *op, SlapReply *rs )
 {
-       slap_callback *cb = op->o_callback;
+       op->o_conn->c_sasl_bindop = NULL;
 
+       return SLAP_CB_CONTINUE;
+}
+
+static int connection_bind_cb( Operation *op, SlapReply *rs )
+{
        ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
        op->o_conn->c_conn_state = SLAP_C_ACTIVE;
        op->o_conn->c_sasl_bind_in_progress =
@@ -2096,6 +2116,7 @@ static void connection_op_queue( Operation *op )
        if (tag == LDAP_REQ_BIND) {
                slap_callback *sc = ch_calloc( 1, sizeof( slap_callback ));
                sc->sc_response = connection_bind_cb;
+               sc->sc_cleanup = connection_bind_cleanup_cb;
                sc->sc_next = op->o_callback;
                op->o_callback = sc;
                op->o_conn->c_conn_state = SLAP_C_BINDING;
@@ -2151,37 +2172,6 @@ static int connection_op_activate( Operation *op )
        return rc;
 }
 
-#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-static int connection_write( ber_socket_t s );
-static void *connection_write_thread( void *ctx, void *arg )
-{
-       return (void *)(long)connection_write((long)arg);
-}
-
-int connection_write_activate( ber_socket_t s )
-{
-       int rc;
-
-       /*
-        * suspend reading on this file descriptor until a connection processing
-        * thread write data on it. Otherwise the listener thread will repeatedly
-        * submit the same event on it to the pool.
-        */
-       slapd_clr_write( s, 0);
-
-       rc = ldap_pvt_thread_pool_submit( &connection_pool,
-               connection_write_thread, (void *)(long)s );
-
-       if( rc != 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "connection_write_activate(%d): submit failed (%d)\n",
-                       (int) s, rc, 0 );
-       }
-       return rc;
-}
-
-static
-#endif
 int connection_write(ber_socket_t s)
 {
        Connection *c;
@@ -2189,6 +2179,8 @@ int connection_write(ber_socket_t s)
 
        assert( connections != NULL );
 
+       slapd_clr_write( s, 0 );
+
        ldap_pvt_thread_mutex_lock( MCA_GET_CONN_MUTEX( s ) );
 
        c = connection_get( s );
@@ -2200,9 +2192,6 @@ int connection_write(ber_socket_t s)
                return -1;
        }
 
-#ifndef SLAP_LIGHTWEIGHT_DISPATCHER
-       slapd_clr_write( s, 0);
-#endif
        c->c_n_write++;
 
        Debug( LDAP_DEBUG_TRACE,