X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Finit.c;h=3beaec8d57f53ff4927794653b66f08d081d10ee;hb=44c2d8a7715f0170dfd396b4067b66ba40f1f369;hp=9d49b424a05730585c05ba0467b6b55ee7210f3b;hpb=4703fe82b20b863b58c573f9dcd123e1fa50e1a2;p=openldap

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 9d49b424a0..3beaec8d57 100644
--- 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-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -64,6 +64,8 @@ ldap_back_initialize(
     BackendInfo	*bi
 )
 {
+	bi->bi_controls = slap_known_controls;
+
 	bi->bi_open = 0;
 	bi->bi_config = 0;
 	bi->bi_close = 0;
@@ -85,11 +87,10 @@ ldap_back_initialize(
 	bi->bi_op_delete = ldap_back_delete;
 	bi->bi_op_abandon = 0;
 
-	bi->bi_extended = 0;
+	bi->bi_extended = ldap_back_extended;
 
-	bi->bi_acl_group = ldap_back_group;
-	bi->bi_acl_attribute = ldap_back_attribute;
 	bi->bi_chk_referrals = 0;
+	bi->bi_entry_get_rw = ldap_back_entry_get;
 
 	bi->bi_connection_init = 0;
 	bi->bi_connection_destroy = ldap_back_conn_destroy;
@@ -103,23 +104,63 @@ ldap_back_db_init(
 )
 {
 	struct ldapinfo	*li;
+	struct ldapmapping *mapping;
 
 	li = (struct ldapinfo *) ch_calloc( 1, sizeof(struct ldapinfo) );
+	if ( li == NULL ) {
+ 		return -1;
+ 	}
+
+	li->binddn.bv_val = NULL;
+	li->binddn.bv_len = 0;
+	li->bindpw.bv_val = NULL;
+	li->bindpw.bv_len = 0;
+
+#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 );
+
+	li->be = be;
 	be->be_private = li;
 
-	return li == NULL;
+	return 0;
 }
 
-static void
-conn_free( 
-	struct ldapconn *lc
+void
+ldap_back_conn_free( 
+	void *v_lc
 )
 {
-	ldap_unbind(lc->ld);
-	if ( lc->bound_dn) free( lc->bound_dn );
-	free( lc );
+	struct ldapconn *lc = v_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 );
+	}
+	if ( lc->local_dn.bv_val ) {
+		ch_free( lc->local_dn.bv_val );
+	}
+	ldap_pvt_thread_mutex_destroy( &lc->lc_mutex );
+	ch_free( lc );
+}
+
+void
+mapping_free( void *v_mapping )
+{
+	struct ldapmapping *mapping = v_mapping;
+	ch_free( mapping->src.bv_val );
+	ch_free( mapping->dst.bv_val );
+	ch_free( mapping );
 }
 
 int
@@ -135,29 +176,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);
-			li->binddn = NULL;
+		if (li->binddn.bv_val) {
+			ch_free(li->binddn.bv_val);
+			li->binddn.bv_val = NULL;
 		}
-		if (li->bindpw) {
-			free(li->bindpw);
-			li->bindpw = NULL;
-		}
-		if (li->suffix_massage) {
-			ldap_value_free( li->suffix_massage );
-			li->suffix_massage = NULL;
+		if (li->bindpw.bv_val) {
+			ch_free(li->bindpw.bv_val);
+			li->bindpw.bv_val = NULL;
 		}
                 if (li->conntree) {
-			avl_free( li->conntree, (AVL_FREE) conn_free );
+			avl_free( li->conntree, ldap_back_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, mapping_free );
+		avl_free( li->at_map.remap, NULL );
+		avl_free( li->at_map.map, 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;
 }