backout this for now

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 025b974a61d4fa31a0ce04d2f05464cc47f55e69..3beaec8d57f53ff4927794653b66f08d081d10ee 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -1,5 +1,10 @@
 /* init.c - initialize ldap backend */
-
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* This is an altered version */
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
  * 
@@ -19,6 +24,15 @@
  *    ever read sources, credits should appear in the documentation.
  * 
  * 4. This notice may not be removed or altered.
+ *
+ *
+ *
+ * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ * 
+ * This software is being modified by Pierangelo Masarati.
+ * The previously reported conditions apply to the modified code as well.
+ * Changes in the original code are highlighted where required.
+ * Credits for the original code go to the author, Howard Chu.
  */
 
 #include "portable.h"
@@ -31,16 +45,16 @@
 #include "back-ldap.h"
 
 #ifdef SLAPD_LDAP_DYNAMIC
-#include <gmodule.h>
 
-G_MODULE_EXPORT void init_module(int argc, char *argv[]) {
-   BackendInfo bi;
+int back_ldap_LTX_init_module(int argc, char *argv[]) {
+    BackendInfo bi;
 
-   memset( &bi, 0, sizeof(bi) );
-   bi.bi_type = "ldap";
-   bi.bi_init = ldap_back_initialize;
+    memset( &bi, '\0', sizeof(bi) );
+    bi.bi_type = "ldap";
+    bi.bi_init = ldap_back_initialize;
 
-   backend_add(&bi);
+    backend_add(&bi);
+    return 0;
 }
 
 #endif /* SLAPD_LDAP_DYNAMIC */
@@ -50,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;
@@ -71,7 +87,10 @@ ldap_back_initialize(
        bi->bi_op_delete = ldap_back_delete;
        bi->bi_op_abandon = 0;
 
-       bi->bi_acl_group = 0;
+       bi->bi_extended = ldap_back_extended;
+
+       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;
@@ -85,13 +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;
+}
+
+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 ) {
+               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
@@ -103,13 +172,43 @@ ldap_back_db_destroy(
 
        if (be->be_private) {
                li = (struct ldapinfo *)be->be_private;
-               if (li->host) {
-                       free(li->host);
-                       li->host = NULL;
+
+               ldap_pvt_thread_mutex_lock( &li->conn_mutex );
+
+               if (li->url) {
+                       ch_free(li->url);
+                       li->url = NULL;
+               }
+               if (li->binddn.bv_val) {
+                       ch_free(li->binddn.bv_val);
+                       li->binddn.bv_val = NULL;
+               }
+               if (li->bindpw.bv_val) {
+                       ch_free(li->bindpw.bv_val);
+                       li->bindpw.bv_val = NULL;
+               }
+                if (li->conntree) {
+                       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;
 }