/* 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 */
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
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 );
+ }
+ if ( lc->cred.bv_val ) {
+ ch_free( lc->cred.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 );
}
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_bvarray_free( li->suffix_massage );
+ }
+#endif /* !ENABLE_REWRITE */
avl_free( li->oc_map.remap, NULL );
avl_free( li->oc_map.map, (AVL_FREE) mapping_free );
ldap_pvt_thread_mutex_destroy( &li->conn_mutex );
}
- free( be->be_private );
+ ch_free( be->be_private );
return 0;
}