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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 4fa8eaea4d..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.
@@ -102,6 +102,7 @@ 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 ) {
@@ -146,6 +147,12 @@ 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;
 
@@ -165,7 +172,7 @@ ldap_back_db_open( BackendDB *be )
 {
 	ldapinfo_t	*li = (ldapinfo_t *)be->be_private;
 
-	slap_bindconf	sb = { 0 };
+	slap_bindconf	sb = { BER_BVNULL };
 	int		rc = 0;
 
 	Debug( LDAP_DEBUG_TRACE,
@@ -191,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 );
@@ -244,6 +249,8 @@ 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 );
 }
 
@@ -264,6 +271,7 @@ 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 );
 
@@ -328,6 +336,14 @@ ldap_back_db_destroy( Backend *be )
                	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 );