Switch to openldap-data

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index a252370a28cecf77a72894c3c39a6c8baef7daa8..a8e3900b6e095babc59fae8919d987ad347ecb65 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -412,7 +412,8 @@ long connection_init(
     assert( c != NULL );
 
        if( c->c_struct_state == SLAP_C_UNINITIALIZED ) {
-               c->c_authmech = NULL;
+               c->c_authmech.bv_val = NULL;
+               c->c_authmech.bv_len = 0;
                c->c_dn.bv_val = NULL;
                c->c_dn.bv_len = 0;
                c->c_ndn.bv_val = NULL;
@@ -421,15 +422,20 @@ long connection_init(
                c->c_cdn.bv_len = 0;
                c->c_groups = NULL;
 
-               c->c_listener_url = NULL;
-               c->c_peer_domain = NULL;
-               c->c_peer_name = NULL;
-               c->c_sock_name = NULL;
+               c->c_listener_url.bv_val = NULL;
+               c->c_listener_url.bv_len = 0;
+               c->c_peer_domain.bv_val = NULL;
+               c->c_peer_domain.bv_len = 0;
+               c->c_peer_name.bv_val = NULL;
+               c->c_peer_name.bv_len = 0;
+               c->c_sock_name.bv_val = NULL;
+               c->c_sock_name.bv_len = 0;
 
                LDAP_STAILQ_INIT(&c->c_ops);
                LDAP_STAILQ_INIT(&c->c_pending_ops);
 
-               c->c_sasl_bind_mech = NULL;
+               c->c_sasl_bind_mech.bv_val = NULL;
+               c->c_sasl_bind_mech.bv_len = 0;
                c->c_sasl_context = NULL;
                c->c_sasl_extra = NULL;
 
@@ -453,26 +459,26 @@ long connection_init(
     ldap_pvt_thread_mutex_lock( &c->c_mutex );
 
     assert( c->c_struct_state == SLAP_C_UNUSED );
-       assert( c->c_authmech == 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_authmech.bv_val == 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_listener_url.bv_val == NULL );
+    assert( c->c_peer_domain.bv_val == NULL );
+    assert( c->c_peer_name.bv_val == NULL );
+    assert( c->c_sock_name.bv_val == 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_bind_mech.bv_val == NULL );
        assert( c->c_sasl_context == NULL );
        assert( c->c_sasl_extra == NULL );
        assert( c->c_currentber == NULL );
 
-       c->c_listener_url = ch_strdup( url  );
-       c->c_peer_domain = ch_strdup( dnsname  );
-    c->c_peer_name = ch_strdup( peername  );
-    c->c_sock_name = ch_strdup( sockname );
+       ber_str2bv( url, 0, 1, &c->c_listener_url );
+       ber_str2bv( dnsname, 0, 1, &c->c_peer_domain );
+       ber_str2bv( peername, 0, 1, &c->c_peer_name );
+       ber_str2bv( sockname, 0, 1, &c->c_sock_name );
 
     c->c_n_ops_received = 0;
     c->c_n_ops_executing = 0;
@@ -576,10 +582,11 @@ void connection2anonymous( Connection *c )
                ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
        }
 
-       if(c->c_authmech != NULL ) {
-               free(c->c_authmech);
-               c->c_authmech = NULL;
+       if(c->c_authmech.bv_val != NULL ) {
+               free(c->c_authmech.bv_val);
+               c->c_authmech.bv_val = NULL;
        }
+       c->c_authmech.bv_len = 0;
 
     if(c->c_dn.bv_val != NULL) {
        free(c->c_dn.bv_val);
@@ -605,7 +612,7 @@ void connection2anonymous( Connection *c )
        GroupAssertion *g, *n;
        for (g = c->c_groups; g; g=n)
        {
-           n = g->next;
+           n = g->ga_next;
            free(g);
        }
        c->c_groups = NULL;
@@ -634,43 +641,48 @@ connection_destroy( Connection *c )
 
        connection2anonymous( c );
 
-       if(c->c_listener_url != NULL) {
-               free(c->c_listener_url);
-               c->c_listener_url = NULL;
+       if(c->c_listener_url.bv_val != NULL) {
+               free(c->c_listener_url.bv_val);
+               c->c_listener_url.bv_val = NULL;
        }
+       c->c_listener_url.bv_len = 0;
 
-       if(c->c_peer_domain != NULL) {
-               free(c->c_peer_domain);
-               c->c_peer_domain = NULL;
+       if(c->c_peer_domain.bv_val != NULL) {
+               free(c->c_peer_domain.bv_val);
+               c->c_peer_domain.bv_val = NULL;
        }
-       if(c->c_peer_name != NULL) {
+       c->c_peer_domain.bv_len = 0;
+       if(c->c_peer_name.bv_val != NULL) {
 #ifdef LDAP_PF_lOCAL
                /*
                 * If peer was a domain socket, unlink. Mind you,
                 * they may be un-named. Should we leave this to
                 * the client?
                 */
-               if (strncmp(c->c_peer_name, "PATH=", 5) == 0) {
-                       char *path = c->c_peer_name + 5;
+               if (strncmp(c->c_peer_name.bv_val, "PATH=", 5) == 0) {
+                       char *path = c->c_peer_name.bv_val + 5;
                        if (path != '\0') {
                                (void)unlink(path);
                        }
                }
 #endif /* LDAP_PF_LOCAL */
 
-               free(c->c_peer_name);
-               c->c_peer_name = NULL;
+               free(c->c_peer_name.bv_val);
+               c->c_peer_name.bv_val = NULL;
        }
-       if(c->c_sock_name != NULL) {
-               free(c->c_sock_name);
-               c->c_sock_name = NULL;
+       c->c_peer_name.bv_len = 0;
+       if(c->c_sock_name.bv_val != NULL) {
+               free(c->c_sock_name.bv_val);
+               c->c_sock_name.bv_val = NULL;
        }
+       c->c_sock_name.bv_len = 0;
 
        c->c_sasl_bind_in_progress = 0;
-       if(c->c_sasl_bind_mech != NULL) {
-               free(c->c_sasl_bind_mech);
-               c->c_sasl_bind_mech = NULL;
+       if(c->c_sasl_bind_mech.bv_val != NULL) {
+               free(c->c_sasl_bind_mech.bv_val);
+               c->c_sasl_bind_mech.bv_val = NULL;
        }
+       c->c_sasl_bind_mech.bv_len = 0;
 
        slap_sasl_close( c );
 
@@ -1476,8 +1488,7 @@ static int connection_op_activate( Connection *conn, Operation *op )
                conn->c_ndn.bv_val : "" );
        }
        arg->co_op->o_authtype = conn->c_authtype;
-       arg->co_op->o_authmech = conn->c_authmech != NULL
-               ?  ch_strdup( conn->c_authmech ) : NULL;
+       ber_dupbv( &arg->co_op->o_authmech, &conn->c_authmech );
        
        if (!arg->co_op->o_protocol) {
            arg->co_op->o_protocol = conn->c_protocol