X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Finit.c;h=bd4e73d3d4b608b8e847fae110d20001772daee4;hb=a3d8cda2011920fae1e499e0f4c8c794f927138e;hp=d744a976810e145eeab45c5ec683499f48f6462d;hpb=c7262c7599eb883d5b28a1dbf64e9883cb17a851;p=openldap

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index d744a97681..bd4e73d3d4 100644
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -1,8 +1,22 @@
 /* init.c - initialize ldap backend */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 /* This is an altered version */
 /*
@@ -39,6 +53,7 @@
 
 #include <stdio.h>
 
+#include <ac/string.h>
 #include <ac/socket.h>
 
 #include "slap.h"
@@ -46,7 +61,7 @@
 
 #ifdef SLAPD_LDAP_DYNAMIC
 
-int back_ldap_LTX_init_module(int argc, char *argv[]) {
+int init_module(int argc, char *argv[]) {
     BackendInfo bi;
 
     memset( &bi, '\0', sizeof(bi) );
@@ -64,6 +79,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,15 +102,16 @@ 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;
 
+	ldap_chain_setup();
+
 	return 0;
 }
 
@@ -110,9 +128,14 @@ ldap_back_db_init(
  		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 ) {
+ 	li->rwmap.rwm_rw = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
+	if ( li->rwmap.rwm_rw == NULL ) {
  		ch_free( li );
  		return -1;
  	}
@@ -120,31 +143,41 @@ ldap_back_db_init(
 
 	ldap_pvt_thread_mutex_init( &li->conn_mutex );
 
-	ldap_back_map_init( &li->at_map, &mapping );
+	ldap_back_map_init( &li->rwmap.rwm_oc, &mapping );
+	ldap_back_map_init( &li->rwmap.rwm_at, &mapping );
 
+	li->be = be;
 	be->be_private = li;
+	be->be_flags |= SLAP_BFLAG_NOLASTMOD;
 
 	return 0;
 }
 
-static void
-conn_free( 
-	struct ldapconn *lc
+void
+ldap_back_conn_free( 
+	void *v_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 ) {
+		memset( lc->cred.bv_val, 0, lc->cred.bv_len );
 		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 ( struct ldapmapping *mapping )
+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 );
@@ -166,31 +199,31 @@ ldap_back_db_destroy(
 			ch_free(li->url);
 			li->url = NULL;
 		}
-		if (li->binddn) {
-			ch_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) {
-			ch_free(li->bindpw);
-			li->bindpw = 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 );
+		if (li->rwmap.rwm_rw) {
+			rewrite_info_delete( &li->rwmap.rwm_rw );
 		}
 #else /* !ENABLE_REWRITE */
-		if (li->suffix_massage) {
-  			ber_bvecfree( li->suffix_massage );
+		if (li->rwmap.rwm_suffix_massage) {
+  			ber_bvarray_free( li->rwmap.rwm_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 );
+		avl_free( li->rwmap.rwm_oc.remap, NULL );
+		avl_free( li->rwmap.rwm_oc.map, mapping_free );
+		avl_free( li->rwmap.rwm_at.remap, NULL );
+		avl_free( li->rwmap.rwm_at.map, mapping_free );
 		
 		ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
 		ldap_pvt_thread_mutex_destroy( &li->conn_mutex );