More cleanups for suffixmassage DNs

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index b41b910fdd3c5947d06b7d614f015decaa64e924..2b4a1c81f93f08626acf720d46e3228b2c09b530 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -1,7 +1,7 @@
 /* init.c - initialize ldap backend */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -120,18 +120,7 @@ ldap_back_db_init(
 
        ldap_pvt_thread_mutex_init( &li->conn_mutex );
 
-       mapping = (struct ldapmapping *)ch_calloc( 2, sizeof(struct ldapmapping) );
-       if ( mapping != NULL ) {
-               mapping->src = ch_strdup("objectclass");
-               mapping->dst = ch_strdup("objectclass");
-               mapping[1].src = mapping->src;
-               mapping[1].dst = mapping->dst;
-
-               avl_insert( &li->at_map.map, (caddr_t)mapping,
-                                       mapping_cmp, mapping_dup );
-               avl_insert( &li->at_map.remap, (caddr_t)&mapping[1],
-                                       mapping_cmp, mapping_dup );
-       }
+       ldap_back_map_init( &li->at_map, &mapping );
 
        be->be_private = li;
 
@@ -143,16 +132,21 @@ conn_free(
        struct ldapconn *lc
 )
 {
-       ldap_unbind(lc->ld);
-       if ( lc->bound_dn.bv_val) free( lc->bound_dn.bv_val );
-       free( lc );
+       ldap_unbind( lc->ld );
+       if ( lc->bound_dn.bv_val ) {
+               ch_free( lc->bound_dn.bv_val );
+       }
+       if ( lc->cred.bv_val ) {
+               ch_free( lc->cred.bv_val );
+       }
+       ch_free( lc );
 }
 
 void
 mapping_free ( struct ldapmapping *mapping )
 {
-       ch_free( mapping->src );
-       ch_free( mapping->dst );
+       ch_free( mapping->src.bv_val );
+       ch_free( mapping->dst.bv_val );
        ch_free( mapping );
 }
 
@@ -169,15 +163,15 @@ ldap_back_db_destroy(
                ldap_pvt_thread_mutex_lock( &li->conn_mutex );
 
                if (li->url) {
-                       free(li->url);
+                       ch_free(li->url);
                        li->url = NULL;
                }
                if (li->binddn) {
-                       free(li->binddn);
+                       ch_free(li->binddn);
                        li->binddn = NULL;
                }
                if (li->bindpw) {
-                       free(li->bindpw);
+                       ch_free(li->bindpw);
                        li->bindpw = NULL;
                }
                 if (li->conntree) {
@@ -189,7 +183,7 @@ ldap_back_db_destroy(
                }
 #else /* !ENABLE_REWRITE */
                if (li->suffix_massage) {
-                       ber_bvecfree( li->suffix_massage );
+                       ber_bvarray_free( li->suffix_massage );
                }
 #endif /* !ENABLE_REWRITE */
 
@@ -202,6 +196,6 @@ ldap_back_db_destroy(
                ldap_pvt_thread_mutex_destroy( &li->conn_mutex );
        }
 
-       free( be->be_private );
+       ch_free( be->be_private );
        return 0;
 }