error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 830c833e8db5b920121a0b6f4ba74f68f7eb7647..a78a33236a1b09b089c730ada760b3d7de8df233 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -1,6 +1,10 @@
 /* init.c - initialize ldap backend */
 /* $OpenLDAP$ */
-
+/*
+ * Copyright 1998-2002 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>
  * 
@@ -20,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"
@@ -36,7 +49,7 @@
 int back_ldap_LTX_init_module(int argc, char *argv[]) {
     BackendInfo bi;
 
-    memset( &bi, 0, sizeof(bi) );
+    memset( &bi, '\0', sizeof(bi) );
     bi.bi_type = "ldap";
     bi.bi_init = ldap_back_initialize;
 
@@ -74,7 +87,9 @@ ldap_back_initialize(
 
        bi->bi_extended = 0;
 
-       bi->bi_acl_group = 0;
+       bi->bi_acl_group = ldap_back_group;
+       bi->bi_acl_attribute = ldap_back_attribute;
+       bi->bi_chk_referrals = 0;
 
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = ldap_back_conn_destroy;
@@ -88,13 +103,46 @@ 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
+conn_free( 
+       struct ldapconn *lc
+)
+{
+       ldap_unbind(lc->ld);
+       if ( lc->bound_dn.bv_val) free( lc->bound_dn.bv_val );
+       free( lc );
+}
+
+void
+mapping_free ( struct ldapmapping *mapping )
+{
+       ch_free( mapping->src.bv_val );
+       ch_free( mapping->dst.bv_val );
+       ch_free( mapping );
 }
 
 int
@@ -106,10 +154,40 @@ 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) {
+                       free(li->url);
+                       li->url = NULL;
+               }
+               if (li->binddn) {
+                       free(li->binddn);
+                       li->binddn = NULL;
+               }
+               if (li->bindpw) {
+                       free(li->bindpw);
+                       li->bindpw = 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 );
+               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 );
        }