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 9d49b424a05730585c05ba0467b6b55ee7210f3b..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 */
@@ -103,13 +103,28 @@ ldap_back_db_init(
 )
 {
        struct ldapinfo *li;
+       struct ldapmapping *mapping;
 
        li = (struct ldapinfo *) ch_calloc( 1, sizeof(struct ldapinfo) );
+       if ( li == NULL ) {
+               return -1;
+       }
+
+#ifdef ENABLE_REWRITE
+       li->rwinfo = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
+       if ( li->rwinfo == NULL ) {
+               ch_free( li );
+               return -1;
+       }
+#endif /* ENABLE_REWRITE */
+
        ldap_pvt_thread_mutex_init( &li->conn_mutex );
 
+       ldap_back_map_init( &li->at_map, &mapping );
+
        be->be_private = li;
 
-       return li == NULL;
+       return 0;
 }
 
 static void
@@ -117,9 +132,22 @@ conn_free(
        struct ldapconn *lc
 )
 {
-       ldap_unbind(lc->ld);
-       if ( lc->bound_dn) free( lc->bound_dn );
-       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.bv_val );
+       ch_free( mapping->dst.bv_val );
+       ch_free( mapping );
 }
 
 int
@@ -135,29 +163,39 @@ 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->suffix_massage) {
-                       ldap_value_free( li->suffix_massage );
-                       li->suffix_massage = NULL;
-               }
                 if (li->conntree) {
                        avl_free( li->conntree, (AVL_FREE) conn_free );
                }
+#ifdef ENABLE_REWRITE
+               if (li->rwinfo) {
+                       rewrite_info_delete( li->rwinfo );
+               }
+#else /* !ENABLE_REWRITE */
+               if (li->suffix_massage) {
+                       ber_bvarray_free( li->suffix_massage );
+               }
+#endif /* !ENABLE_REWRITE */
+
+               avl_free( li->oc_map.remap, NULL );
+               avl_free( li->oc_map.map, (AVL_FREE) mapping_free );
+               avl_free( li->at_map.remap, NULL );
+               avl_free( li->at_map.map, (AVL_FREE) mapping_free );
                
                ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
                ldap_pvt_thread_mutex_destroy( &li->conn_mutex );
        }
 
-       free( be->be_private );
+       ch_free( be->be_private );
        return 0;
 }