int
ldap_back_initialize( BackendInfo *bi )
{
+ int rc;
+
bi->bi_flags =
#ifdef LDAP_DYNAMIC_OBJECTS
/* this is set because all the support a proxy has to provide
bi->bi_db_init = ldap_back_db_init;
bi->bi_db_config = config_generic_wrapper;
bi->bi_db_open = ldap_back_db_open;
- bi->bi_db_close = 0;
+ bi->bi_db_close = ldap_back_db_close;
bi->bi_db_destroy = ldap_back_db_destroy;
bi->bi_op_bind = ldap_back_bind;
bi->bi_connection_init = 0;
bi->bi_connection_destroy = ldap_back_conn_destroy;
- if ( chain_initialize() ) {
- return -1;
+ rc = chain_initialize();
+ if ( rc ) {
+ return rc;
}
#ifdef SLAP_DISTPROC
- if ( distproc_initialize() ) {
- return -1;
+ rc = distproc_initialize();
+ if ( rc ) {
+ return rc;
}
#endif
ldap_back_db_init( Backend *be )
{
ldapinfo_t *li;
+ int rc;
+ unsigned i;
li = (ldapinfo_t *)ch_calloc( 1, sizeof( ldapinfo_t ) );
if ( li == NULL ) {
ldap_pvt_thread_mutex_init( &li->li_conninfo.lai_mutex );
+ for ( i = LDAP_BACK_PCONN_FIRST; i < LDAP_BACK_PCONN_LAST; i++ ) {
+ li->li_conn_priv[ i ].lic_num = 0;
+ LDAP_TAILQ_INIT( &li->li_conn_priv[ i ].lic_priv );
+ }
+ li->li_conn_priv_max = LDAP_BACK_CONN_PRIV_DEFAULT;
+
be->be_private = li;
SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_NOLASTMOD;
be->be_cf_ocs = be->bd_info->bi_cf_ocs;
- return 0;
+ rc = ldap_back_monitor_db_init( be );
+ if ( rc != 0 ) {
+ /* ignore, by now */
+ rc = 0;
+ }
+
+ return rc;
}
int
ldapinfo_t *li = (ldapinfo_t *)be->be_private;
slap_bindconf sb = { 0 };
- int rc;
+ int rc = 0;
Debug( LDAP_DEBUG_TRACE,
"ldap_back_db_open: URI=%s\n",
}
}
+ /* monitor setup */
+ rc = ldap_back_monitor_db_open( be );
+ if ( rc != 0 ) {
+ /* ignore by now */
+ rc = 0;
+#if 0
+ goto fail;
+#endif
+ }
+
li->li_flags |= LDAP_BACK_F_ISOPEN;
- return 0;
+fail:;
+ return rc;
}
void
if ( !BER_BVISNULL( &lc->lc_local_ndn ) ) {
ch_free( lc->lc_local_ndn.bv_val );
}
+ lc->lc_q.tqe_prev = NULL;
+ lc->lc_q.tqe_next = NULL;
ch_free( lc );
}
int
-ldap_back_db_destroy(
- Backend *be
-)
+ldap_back_db_close( Backend *be )
+{
+ int rc = 0;
+
+ if ( be->be_private ) {
+ rc = ldap_back_monitor_db_close( be );
+ }
+
+ return rc;
+}
+
+int
+ldap_back_db_destroy( Backend *be )
{
if ( be->be_private ) {
ldapinfo_t *li = ( ldapinfo_t * )be->be_private;
+ unsigned i;
+
+ (void)ldap_back_monitor_db_destroy( be );
ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
if ( li->li_conninfo.lai_tree ) {
avl_free( li->li_conninfo.lai_tree, ldap_back_conn_free );
}
+ for ( i = LDAP_BACK_PCONN_FIRST; i < LDAP_BACK_PCONN_LAST; i++ ) {
+ while ( !LDAP_TAILQ_EMPTY( &li->li_conn_priv[ i ].lic_priv ) ) {
+ ldapconn_t *lc = LDAP_TAILQ_FIRST( &li->li_conn_priv[ i ].lic_priv );
+
+ LDAP_TAILQ_REMOVE( &li->li_conn_priv[ i ].lic_priv, lc, lc_q );
+ ldap_back_conn_free( lc );
+ }
+ }
if ( LDAP_BACK_QUARANTINE( li ) ) {
slap_retry_info_destroy( &li->li_quarantine );
ldap_pvt_thread_mutex_destroy( &li->li_quarantine_mutex );