cleanup

[openldap] / servers / slapd / back-ldap / config.c

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 41ec3b69400ae8a0e01b6c86bc1bf164720761b6..215555372c24f6edbda7989e3b562ef5313fc2f3 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -552,7 +552,6 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
        int             rc;
 
        if ( strcmp( c->argv[ 1 ], "*" ) == 0
-               || strcmp( c->argv[ 1 ], ".*" ) == 0
                || strcmp( c->argv[ 1 ], "dn:*" ) == 0
                || strcasecmp( c->argv[ 1 ], "dn.regex:.*" ) == 0 )
        {
@@ -786,14 +785,16 @@ ldap_back_cf_gen( ConfigArgs *c )
 
                        if ( !BER_BVISEMPTY( &bc )) {
                                bv2.bv_len = bv.bv_len + bc.bv_len + 1;
-                               bv2.bv_val = ch_malloc(bv2.bv_len + 1 );
+                               bv2.bv_val = ch_malloc( bv2.bv_len + 1 );
                                strcpy( bv2.bv_val, bv.bv_val );
                                bv2.bv_val[bv.bv_len] = ' ';
-                               strcpy( bv2.bv_val+bv.bv_len+1, bc.bv_val );
+                               strcpy( &bv2.bv_val[bv.bv_len + 1], bc.bv_val );
                                ber_bvarray_add( &c->rvalue_vals, &bv2 );
+
                        } else {
                                value_add_one( &c->rvalue_vals, &bv );
                        }
+                       ber_memfree( bc.bv_val );
                        }
                        break;
 
@@ -1395,7 +1396,7 @@ done_url:;
                li->li_flags &= ~LDAP_BACK_F_TLS_MASK;
                li->li_flags |= tls_mode[i].mask;
                if ( c->argc > 2 ) {
-                       for ( i=0; i<c->argc; i++ ) {
+                       for ( i=2; i<c->argc; i++ ) {
                                if ( bindconf_tls_parse( c->argv[i], &li->li_tls ))
                                        return 1;
                        }
@@ -2005,7 +2006,7 @@ retry:
                }
 
                if ( lc != NULL ) {
-                       ldap_back_release_conn( &op2, rs, lc );
+                       ldap_back_release_conn( (ldapinfo_t *)op2.o_bd->be_private, lc );
                }
 
        } else {