int
meta_back_open(
- BackendInfo *bi
-)
+ BackendInfo *bi )
{
+ /* FIXME: need to remove the pagedResults, and likely more... */
bi->bi_controls = slap_known_controls;
+
return 0;
}
int
meta_back_initialize(
- BackendInfo *bi
-)
+ BackendInfo *bi )
{
bi->bi_open = meta_back_open;
bi->bi_config = 0;
bi->bi_db_init = meta_back_db_init;
bi->bi_db_config = meta_back_db_config;
- bi->bi_db_open = 0;
+ bi->bi_db_open = meta_back_db_open;
bi->bi_db_close = 0;
bi->bi_db_destroy = meta_back_db_destroy;
int
meta_back_db_init(
- Backend *be
-)
+ Backend *be )
{
- struct metainfo *li;
-
- struct rewrite_info *rwinfo;
-
- rwinfo = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
- if ( rwinfo == NULL ) {
- return -1;
- }
+ metainfo_t *mi;
- li = ch_calloc( 1, sizeof( struct metainfo ) );
- if ( li == NULL ) {
- rewrite_info_delete( &rwinfo );
+ mi = ch_malloc( sizeof( metainfo_t ) );
+ if ( mi == NULL ) {
return -1;
}
+ memset( mi, 0, sizeof( metainfo_t ) );
/*
* At present the default is no default target;
* this may change
*/
- li->defaulttarget = META_DEFAULT_TARGET_NONE;
- li->rwinfo = rwinfo;
+ mi->mi_defaulttarget = META_DEFAULT_TARGET_NONE;
+
+ ldap_pvt_thread_mutex_init( &mi->mi_conn_mutex );
+ ldap_pvt_thread_mutex_init( &mi->mi_cache.mutex );
- ldap_pvt_thread_mutex_init( &li->conn_mutex );
- ldap_pvt_thread_mutex_init( &li->cache.mutex );
- be->be_private = li;
+ /* safe default */
+ mi->mi_nretries = META_RETRY_DEFAULT;
+ mi->mi_version = LDAP_VERSION3;
+
+ be->be_private = mi;
+
+ return 0;
+}
+
+int
+meta_back_db_open(
+ Backend *be )
+{
+ metainfo_t *mi = (metainfo_t *)be->be_private;
+
+ int i, rc;
+
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ if ( mi->mi_targets[ i ].mt_flags & LDAP_BACK_F_SUPPORT_T_F_DISCOVER )
+ {
+ mi->mi_targets[ i ].mt_flags &= ~LDAP_BACK_F_SUPPORT_T_F_DISCOVER;
+ rc = slap_discover_feature( mi->mi_targets[ i ].mt_uri,
+ mi->mi_targets[ i ].mt_version,
+ slap_schema.si_ad_supportedFeatures->ad_cname.bv_val,
+ LDAP_FEATURE_ABSOLUTE_FILTERS );
+ if ( rc == LDAP_COMPARE_TRUE ) {
+ mi->mi_targets[ i ].mt_flags |= LDAP_BACK_F_SUPPORT_T_F;
+ }
+ }
+ }
return 0;
}
static void
conn_free(
- void *v_lc
-)
+ void *v_mc )
{
- struct metaconn *lc = v_lc;
- struct metasingleconn *lsc;
+ metaconn_t *mc = v_mc;
+ int i, ntargets;
+
+ assert( mc->mc_conns != NULL );
+
+ /* at least one must be present... */
+ ntargets = mc->mc_conns[ 0 ].msc_info->mi_ntargets;
+
+ for ( i = 0; i < ntargets; i++ ) {
+ metasingleconn_t *msc = &mc->mc_conns[ i ];
- for ( lsc = lc->mc_conns; !META_LAST( lsc ); lsc++ ) {
- if ( lsc->msc_ld != NULL ) {
- ldap_unbind_ext_s( lsc->msc_ld, NULL, NULL );
+ if ( msc->msc_ld != NULL ) {
+ ldap_unbind_ext_s( msc->msc_ld, NULL, NULL );
}
- if ( !BER_BVISNULL( &lsc->msc_bound_ndn ) ) {
- ber_memfree( lsc->msc_bound_ndn.bv_val );
+
+ if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) {
+ ber_memfree( msc->msc_bound_ndn.bv_val );
}
- if ( !BER_BVISNULL( &lsc->msc_cred ) ) {
+
+ if ( !BER_BVISNULL( &msc->msc_cred ) ) {
/* destroy sensitive data */
- memset( lsc->msc_cred.bv_val, 0, lsc->msc_cred.bv_len );
- ber_memfree( lsc->msc_cred.bv_val );
+ memset( msc->msc_cred.bv_val, 0, msc->msc_cred.bv_len );
+ ber_memfree( msc->msc_cred.bv_val );
}
}
- free( lc->mc_conns );
- free( lc );
+
+ free( mc );
}
static void
-mapping_free( void *v_mapping )
+mapping_free(
+ void *v_mapping )
{
struct ldapmapping *mapping = v_mapping;
ch_free( mapping->src.bv_val );
static void
target_free(
- struct metatarget *lt
-)
+ metatarget_t *mt )
{
- if ( lt->mt_uri ) {
- free( lt->mt_uri );
+ if ( mt->mt_uri ) {
+ free( mt->mt_uri );
}
- if ( !BER_BVISNULL( <->mt_psuffix ) ) {
- free( lt->mt_psuffix.bv_val );
+ if ( !BER_BVISNULL( &mt->mt_psuffix ) ) {
+ free( mt->mt_psuffix.bv_val );
}
- if ( !BER_BVISNULL( <->mt_nsuffix ) ) {
- free( lt->mt_nsuffix.bv_val );
+ if ( !BER_BVISNULL( &mt->mt_nsuffix ) ) {
+ free( mt->mt_nsuffix.bv_val );
}
- if ( !BER_BVISNULL( <->mt_binddn ) ) {
- free( lt->mt_binddn.bv_val );
+ if ( !BER_BVISNULL( &mt->mt_binddn ) ) {
+ free( mt->mt_binddn.bv_val );
}
- if ( !BER_BVISNULL( <->mt_bindpw ) ) {
- free( lt->mt_bindpw.bv_val );
+ if ( !BER_BVISNULL( &mt->mt_bindpw ) ) {
+ free( mt->mt_bindpw.bv_val );
}
- if ( !BER_BVISNULL( <->mt_pseudorootdn ) ) {
- free( lt->mt_pseudorootdn.bv_val );
+ if ( !BER_BVISNULL( &mt->mt_pseudorootdn ) ) {
+ free( mt->mt_pseudorootdn.bv_val );
}
- if ( !BER_BVISNULL( <->mt_pseudorootpw ) ) {
- free( lt->mt_pseudorootpw.bv_val );
+ if ( !BER_BVISNULL( &mt->mt_pseudorootpw ) ) {
+ free( mt->mt_pseudorootpw.bv_val );
}
- if ( lt->mt_rwmap.rwm_rw ) {
- rewrite_info_delete( <->mt_rwmap.rwm_rw );
+ if ( mt->mt_rwmap.rwm_rw ) {
+ rewrite_info_delete( &mt->mt_rwmap.rwm_rw );
}
- avl_free( lt->mt_rwmap.rwm_oc.remap, NULL );
- avl_free( lt->mt_rwmap.rwm_oc.map, mapping_free );
- avl_free( lt->mt_rwmap.rwm_at.remap, NULL );
- avl_free( lt->mt_rwmap.rwm_at.map, mapping_free );
+ avl_free( mt->mt_rwmap.rwm_oc.remap, NULL );
+ avl_free( mt->mt_rwmap.rwm_oc.map, mapping_free );
+ avl_free( mt->mt_rwmap.rwm_at.remap, NULL );
+ avl_free( mt->mt_rwmap.rwm_at.map, mapping_free );
}
int
meta_back_db_destroy(
- Backend *be
-)
+ Backend *be )
{
- struct metainfo *li;
+ metainfo_t *mi;
if ( be->be_private ) {
int i;
- li = ( struct metainfo * )be->be_private;
+ mi = ( metainfo_t * )be->be_private;
/*
* Destroy the connection tree
*/
- ldap_pvt_thread_mutex_lock( &li->conn_mutex );
+ ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
- if ( li->conntree ) {
- avl_free( li->conntree, conn_free );
+ if ( mi->mi_conntree ) {
+ avl_free( mi->mi_conntree, conn_free );
}
/*
* Destroy the per-target stuff (assuming there's at
* least one ...)
*/
- for ( i = 0; i < li->ntargets; i++ ) {
- target_free( li->targets[ i ] );
- free( li->targets[ i ] );
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ target_free( &mi->mi_targets[ i ] );
}
- free( li->targets );
+ free( mi->mi_targets );
- ldap_pvt_thread_mutex_lock( &li->cache.mutex );
- if ( li->cache.tree ) {
- avl_free( li->cache.tree, meta_dncache_free );
+ ldap_pvt_thread_mutex_lock( &mi->mi_cache.mutex );
+ if ( mi->mi_cache.tree ) {
+ avl_free( mi->mi_cache.tree, meta_dncache_free );
}
- ldap_pvt_thread_mutex_unlock( &li->cache.mutex );
- ldap_pvt_thread_mutex_destroy( &li->cache.mutex );
+ ldap_pvt_thread_mutex_unlock( &mi->mi_cache.mutex );
+ ldap_pvt_thread_mutex_destroy( &mi->mi_cache.mutex );
- ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
- ldap_pvt_thread_mutex_destroy( &li->conn_mutex );
+ ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex );
+ ldap_pvt_thread_mutex_destroy( &mi->mi_conn_mutex );
+
+ if ( mi->mi_candidates != NULL ) {
+ ber_memfree_x( mi->mi_candidates, NULL );
+ }
}
free( be->be_private );
projects / openldap / blobdiff