error message from be_entry_put tool backend function

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index ed8659fd8edd924bc2e5922b211ecb0fc9afe715..766ca439bf0ce53f5c10611bfe00a655a4ff1c87 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -20,9 +20,6 @@
 #include "lutil.h"
 #include "slap.h"
 
-/* I guess this should be declared in ldap_pvt.h */
-extern void * ldap_pvt_tls_sb_ctx( Sockbuf *sb );
-
 /* protected by connections_mutex */
 static ldap_pvt_thread_mutex_t connections_mutex;
 static Connection *connections = NULL;
@@ -368,7 +365,7 @@ long connection_init(
 
 #else
        {
-               unsigned int i;
+               ber_socket_t    i;
 
                c = NULL;
 
@@ -416,8 +413,12 @@ long connection_init(
 
        if( c->c_struct_state == SLAP_C_UNINITIALIZED ) {
                c->c_authmech = NULL;
-               c->c_dn = NULL;
-               c->c_cdn = NULL;
+               c->c_dn.bv_val = NULL;
+               c->c_dn.bv_len = 0;
+               c->c_ndn.bv_val = NULL;
+               c->c_ndn.bv_len = 0;
+               c->c_cdn.bv_val = NULL;
+               c->c_cdn.bv_len = 0;
                c->c_groups = NULL;
 
                c->c_listener_url = NULL;
@@ -425,8 +426,8 @@ long connection_init(
                c->c_peer_name = NULL;
                c->c_sock_name = NULL;
 
-               c->c_ops = NULL;
-               c->c_pending_ops = NULL;
+               LDAP_STAILQ_INIT(&c->c_ops);
+               LDAP_STAILQ_INIT(&c->c_pending_ops);
 
                c->c_sasl_bind_mech = NULL;
                c->c_sasl_context = NULL;
@@ -453,15 +454,16 @@ long connection_init(
 
     assert( c->c_struct_state == SLAP_C_UNUSED );
        assert( c->c_authmech == NULL );
-    assert(    c->c_dn == NULL );
-    assert(    c->c_cdn == NULL );
+    assert(    c->c_dn.bv_val == NULL );
+    assert(    c->c_ndn.bv_val == NULL );
+    assert(    c->c_cdn.bv_val == NULL );
     assert( c->c_groups == NULL );
     assert( c->c_listener_url == NULL );
     assert( c->c_peer_domain == NULL );
     assert( c->c_peer_name == NULL );
     assert( c->c_sock_name == NULL );
-    assert( c->c_ops == NULL );
-    assert( c->c_pending_ops == NULL );
+    assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
+    assert( LDAP_STAILQ_EMPTY(&c->c_pending_ops) );
        assert( c->c_sasl_bind_mech == NULL );
        assert( c->c_sasl_context == NULL );
        assert( c->c_sasl_extra == NULL );
@@ -503,6 +505,8 @@ long connection_init(
 #endif
        ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_udp,
                LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
+       ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_readahead,
+               LBER_SBIOD_LEVEL_PROVIDER, NULL );
        } else
 #endif
        {
@@ -513,8 +517,6 @@ long connection_init(
        ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_tcp,
                LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
        }
-       ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_readahead,
-               LBER_SBIOD_LEVEL_PROVIDER, NULL );
 
 #ifdef LDAP_DEBUG
        ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_debug,
@@ -579,15 +581,22 @@ void connection2anonymous( Connection *c )
                c->c_authmech = NULL;
        }
 
-    if(c->c_dn != NULL) {
-       free(c->c_dn);
-       c->c_dn = NULL;
+    if(c->c_dn.bv_val != NULL) {
+       free(c->c_dn.bv_val);
+       c->c_dn.bv_val = NULL;
     }
+    c->c_dn.bv_len = 0;
+    if(c->c_ndn.bv_val != NULL) {
+       free(c->c_ndn.bv_val);
+       c->c_ndn.bv_val = NULL;
+    }
+    c->c_ndn.bv_len = 0;
 
-       if(c->c_cdn != NULL) {
-               free(c->c_cdn);
-               c->c_cdn = NULL;
+       if(c->c_cdn.bv_val != NULL) {
+               free(c->c_cdn.bv_val);
+               c->c_cdn.bv_val = NULL;
        }
+       c->c_cdn.bv_len = 0;
 
        c->c_authc_backend = NULL;
        c->c_authz_backend = NULL;
@@ -614,7 +623,7 @@ connection_destroy( Connection *c )
     assert( c != NULL );
     assert( c->c_struct_state != SLAP_C_UNUSED );
     assert( c->c_conn_state != SLAP_C_INVALID );
-    assert( c->c_ops == NULL );
+    assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
 
     backend_connection_destroy(c);
 
@@ -713,17 +722,16 @@ static void connection_abandon( Connection *c )
 
        Operation *o;
 
-       for( o = c->c_ops; o != NULL; o = o->o_next ) {
+       LDAP_STAILQ_FOREACH(o, &c->c_ops, o_next) {
                ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
                o->o_abandon = 1;
                ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
        }
 
        /* remove pending operations */
-       for( o = slap_op_pop( &c->c_pending_ops );
-               o != NULL;
-               o = slap_op_pop( &c->c_pending_ops ) )
-       {
+       while ( (o = LDAP_STAILQ_FIRST( &c->c_pending_ops )) != NULL) {
+               LDAP_STAILQ_REMOVE_HEAD( &c->c_pending_ops, o_next );
+               LDAP_STAILQ_NEXT(o, o_next) = NULL;
                slap_op_free( o );
        }
 }
@@ -777,7 +785,7 @@ static void connection_close( Connection *c )
        /* note: connections_mutex and c_mutex should be locked by caller */
 
        ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
-       if( c->c_ops != NULL ) {
+       if( !LDAP_STAILQ_EMPTY(&c->c_ops) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
                           "connection_close: conn %d  deferring sd %d\n",
@@ -980,7 +988,8 @@ operations_error:
        conn->c_n_ops_executing--;
        conn->c_n_ops_completed++;
 
-       slap_op_remove( &conn->c_ops, arg->co_op );
+       LDAP_STAILQ_REMOVE( &conn->c_ops, arg->co_op, slap_op, o_next);
+       LDAP_STAILQ_NEXT(arg->co_op, o_next) = NULL;
        slap_op_free( arg->co_op );
        arg->co_op = NULL;
        arg->co_conn = NULL;
@@ -1344,7 +1353,7 @@ connection_input(
                Debug( LDAP_DEBUG_ANY, "deferring operation\n", 0, 0, 0 );
 #endif
                conn->c_n_ops_pending++;
-               slap_op_add( &conn->c_pending_ops, op );
+               LDAP_STAILQ_INSERT_TAIL( &conn->c_pending_ops, op, o_next );
 
        } else {
                conn->c_n_ops_executing++;
@@ -1427,10 +1436,9 @@ connection_resched( Connection *conn )
                return 0;
        }
 
-       for( op = slap_op_pop( &conn->c_pending_ops );
-               op != NULL;
-               op = slap_op_pop( &conn->c_pending_ops ) )
-       {
+       while ((op = LDAP_STAILQ_FIRST( &conn->c_pending_ops )) != NULL) {
+               LDAP_STAILQ_REMOVE_HEAD( &conn->c_pending_ops, o_next );
+               LDAP_STAILQ_NEXT(op, o_next) = NULL;
                /* pending operations should not be marked for abandonment */
                assert(!op->o_abandon);
 
@@ -1460,12 +1468,13 @@ static int connection_op_activate( Connection *conn, Operation *op )
        arg->co_conn = conn;
        arg->co_op = op;
 
-       if (!arg->co_op->o_dn) {
+       if (!arg->co_op->o_dn.bv_len) {
            arg->co_op->o_authz = conn->c_authz;
-           arg->co_op->o_dn = ch_strdup( conn->c_dn != NULL ? conn->c_dn : "" );
+           arg->co_op->o_dn.bv_val = ch_strdup( conn->c_dn.bv_val ?
+               conn->c_dn.bv_val : "" );
+           arg->co_op->o_ndn.bv_val = ch_strdup( conn->c_ndn.bv_val ?
+               conn->c_ndn.bv_val : "" );
        }
-       arg->co_op->o_ndn = ch_strdup( arg->co_op->o_dn );
-       (void) dn_normalize( arg->co_op->o_ndn );
        arg->co_op->o_authtype = conn->c_authtype;
        arg->co_op->o_authmech = conn->c_authmech != NULL
                ?  ch_strdup( conn->c_authmech ) : NULL;
@@ -1476,7 +1485,7 @@ static int connection_op_activate( Connection *conn, Operation *op )
        }
        arg->co_op->o_connid = conn->c_connid;
 
-       slap_op_add( &conn->c_ops, arg->co_op );
+       LDAP_STAILQ_INSERT_TAIL( &conn->c_ops, arg->co_op, o_next );
 
        status = ldap_pvt_thread_pool_submit( &connection_pool,
                connection_operation, (void *) arg );
@@ -1574,13 +1583,13 @@ int connection_internal_open( Connection **conn, LDAP **ldp, const char *id )
 
        /* A search operation, number 0 */
        op = slap_op_alloc( NULL, 0, LDAP_REQ_SEARCH, 0);
-       op->o_ndn = ch_strdup( id );
+       op->o_ndn.bv_val = ch_strdup( id );
+       op->o_ndn.bv_len = strlen( id );
        op->o_protocol = LDAP_VERSION3;
 
        (*conn) = connection_get( fd[1] );
-       (*conn)->c_ops = op;
-    (*conn)->c_conn_state = SLAP_C_ACTIVE;
-
+       LDAP_STAILQ_INSERT_HEAD( &(*conn)->c_ops, op, o_next);
+       (*conn)->c_conn_state = SLAP_C_ACTIVE;
 
        /* Create the client side of the connection */
        rc = ldap_open_internal_connection( ldp, &(fd[0]) );
@@ -1598,9 +1607,10 @@ int connection_internal_open( Connection **conn, LDAP **ldp, const char *id )
 
 void connection_internal_close( Connection *conn )
 {
-       Operation *op = conn->c_ops;
+       Operation *op = LDAP_STAILQ_FIRST(&conn->c_ops);
 
-       slap_op_remove( &conn->c_ops, op );
+       LDAP_STAILQ_REMOVE_HEAD(&conn->c_ops, o_next);
+       LDAP_STAILQ_NEXT(op, o_next) = NULL;
        slap_op_free( op );
        connection_closing( conn );
        connection_close( conn );