Silence a warning about ldap_debug

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 96e1acbd79402e1add26e7a0d6495d8f2b6e0b2b..0a15816a1e16a0d2d01c11bdd9259b2a4526b153 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 */
@@ -106,24 +106,25 @@ ldap_back_db_init(
        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 );
 
-       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;
 
-       return li == NULL;
+       return 0;
 }
 
 static void
@@ -131,16 +132,18 @@ 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 );
+       }
+       ch_free( lc );
 }
 
-static void
+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 );
 }
 
@@ -157,24 +160,29 @@ 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_bvecfree( li->suffix_massage );
+               }
+#endif /* !ENABLE_REWRITE */
 
                avl_free( li->oc_map.remap, NULL );
                avl_free( li->oc_map.map, (AVL_FREE) mapping_free );
@@ -185,6 +193,6 @@ ldap_back_db_destroy(
                ldap_pvt_thread_mutex_destroy( &li->conn_mutex );
        }
 
-       free( be->be_private );
+       ch_free( be->be_private );
        return 0;
 }