X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Finit.c;h=d9a4ff61c4250aca3d77f24a1a85a48c428c4e5a;hb=fb2e448e877a8a387084dde517362c9f7bf1b6b7;hp=42ef7877fd1d25221a4e1aaa2d9ca0daddc6fd22;hpb=8eb455e7b2f2b7d52a59fbab82d31468766ebea9;p=openldap

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 42ef7877fd..d9a4ff61c4 100644
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2006 The OpenLDAP Foundation.
+ * Copyright 2003-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -41,6 +41,8 @@ ldap_back_open( BackendInfo	*bi )
 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
@@ -59,7 +61,7 @@ ldap_back_initialize( BackendInfo *bi )
 	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;
@@ -80,13 +82,15 @@ ldap_back_initialize( BackendInfo *bi )
 	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
 
@@ -97,6 +101,8 @@ int
 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 ) {
@@ -141,12 +147,24 @@ ldap_back_db_init( Backend *be )
 
 	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
@@ -154,8 +172,8 @@ ldap_back_db_open( BackendDB *be )
 {
 	ldapinfo_t	*li = (ldapinfo_t *)be->be_private;
 
-	slap_bindconf	sb = { 0 };
-	int		rc;
+	slap_bindconf	sb = { BER_BVNULL };
+	int		rc = 0;
 
 	Debug( LDAP_DEBUG_TRACE,
 		"ldap_back_db_open: URI=%s\n",
@@ -180,8 +198,6 @@ ldap_back_db_open( BackendDB *be )
 	BER_BVSTR( &sb.sb_binddn, "" );
 
 	if ( LDAP_BACK_T_F_DISCOVER( li ) && !LDAP_BACK_T_F( li ) ) {
-		int		rc;
-
 		rc = slap_discover_feature( &sb,
 				slap_schema.si_ad_supportedFeatures->ad_cname.bv_val,
 				LDAP_FEATURE_ABSOLUTE_FILTERS );
@@ -199,9 +215,20 @@ ldap_back_db_open( BackendDB *be )
 		}
 	}
 
+	/* 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
@@ -222,16 +249,31 @@ ldap_back_conn_free( void *v_lc )
 	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 );
 
@@ -294,6 +336,14 @@ ldap_back_db_destroy(
                	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 );