fix dangling resources issue in slapd-ldap; completely rework slapo-chain to...

fix dangling resources issue in slapd-ldap; completely rework slapo-chain to fix the resource leak/concurrency issue; add support for multiple well-known URIs to set credentials for, and deal with unknown URIs anonymously; similar reworking and cleanup for slapd-meta

servers/slapd/back-ldap/add.c

@@ -36,9 +36,9 @@ ldap_back_add(
 	Operation	*op,
 	SlapReply	*rs )
 {
-	struct ldapinfo	*li = (struct ldapinfo *)op->o_bd->be_private;
+	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
 
-	struct ldapconn	*lc;
+	ldapconn_t	*lc;
 	int		i = 0,
 			j = 0;
 	Attribute	*a;
@@ -103,10 +103,10 @@ retry:
 	rs->sr_err = ldap_add_ext( lc->lc_ld, op->o_req_dn.bv_val, attrs,
 			ctrls, NULL, &msgid );
 	rs->sr_err = ldap_back_op_result( lc, op, rs, msgid,
-		li->timeout[ LDAP_BACK_OP_ADD ], LDAP_BACK_SENDRESULT );
+		li->li_timeout[ LDAP_BACK_OP_ADD ], LDAP_BACK_SENDRESULT );
 	if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
 		do_retry = 0;
-		if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+		if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
 			goto retry;
 		}
 	}

servers/slapd/back-ldap/back-ldap.h

@@ -26,7 +26,7 @@
 
 LDAP_BEGIN_DECL
 
-struct ldapconn {
+typedef struct ldapconn_t {
 	Connection		*lc_conn;
 #define	LDAP_BACK_PCONN		((void *)0x0)
 #define	LDAP_BACK_PCONN_TLS	((void *)0x1)
@@ -79,7 +79,7 @@ struct ldapconn {
 
 	unsigned		lc_refcnt;
 	unsigned		lc_flags;
-};
+} ldapconn_t;
 
 /*
  * identity assertion modes
@@ -104,50 +104,58 @@ enum {
 	LDAP_BACK_OP_LAST
 };
 
-struct ldapinfo {
-	char		*url;
-	LDAPURLDesc	*lud;
-
-	slap_bindconf	acl_sb;
-#define	acl_authcID	acl_sb.sb_authcId
-#define	acl_authcDN	acl_sb.sb_binddn
-#define	acl_passwd	acl_sb.sb_cred
-#define	acl_authzID	acl_sb.sb_authzId
-#define	acl_authmethod	acl_sb.sb_method
-#define	acl_sasl_mech	acl_sb.sb_saslmech
-#define	acl_sasl_realm	acl_sb.sb_realm
-#define	acl_secprops	acl_sb.sb_secprops
+typedef struct ldap_avl_info_t {
+	ldap_pvt_thread_mutex_t		lai_mutex;
+	Avlnode				*lai_tree;
+} ldap_avl_info_t;
+
+typedef struct ldapinfo_t {
+	/* li_uri: the string that goes into ldap_initialize()
+	 * TODO: use li_acl.sb_uri instead */
+	char		*li_uri;
+	/* li_bvuri: an array of each single URI that is equivalent;
+	 * to be checked for the presence of a certain item */
+	BerVarray	li_bvuri;
+
+	slap_bindconf	li_acl;
+#define	li_acl_authcID	li_acl.sb_authcId
+#define	li_acl_authcDN	li_acl.sb_binddn
+#define	li_acl_passwd	li_acl.sb_cred
+#define	li_acl_authzID	li_acl.sb_authzId
+#define	li_acl_authmethod	li_acl.sb_method
+#define	li_acl_sasl_mech	li_acl.sb_saslmech
+#define	li_acl_sasl_realm	li_acl.sb_realm
+#define	li_acl_secprops	li_acl.sb_secprops
 
 	/* ID assert stuff */
-	int		idassert_mode;
-
-	slap_bindconf	idassert_sb;
-#define	idassert_authcID	idassert_sb.sb_authcId
-#define	idassert_authcDN	idassert_sb.sb_binddn
-#define	idassert_passwd		idassert_sb.sb_cred
-#define	idassert_authzID	idassert_sb.sb_authzId
-#define	idassert_authmethod	idassert_sb.sb_method
-#define	idassert_sasl_mech	idassert_sb.sb_saslmech
-#define	idassert_sasl_realm	idassert_sb.sb_realm
-#define	idassert_secprops	idassert_sb.sb_secprops
-
-	unsigned 	idassert_flags;
+	int		li_idassert_mode;
+
+	slap_bindconf	li_idassert;
+#define	li_idassert_authcID	li_idassert.sb_authcId
+#define	li_idassert_authcDN	li_idassert.sb_binddn
+#define	li_idassert_passwd	li_idassert.sb_cred
+#define	li_idassert_authzID	li_idassert.sb_authzId
+#define	li_idassert_authmethod	li_idassert.sb_method
+#define	li_idassert_sasl_mech	li_idassert.sb_saslmech
+#define	li_idassert_sasl_realm	li_idassert.sb_realm
+#define	li_idassert_secprops	li_idassert.sb_secprops
+
+	unsigned 	li_idassert_flags;
 #define LDAP_BACK_AUTH_NONE		0x00U
 #define	LDAP_BACK_AUTH_NATIVE_AUTHZ	0x01U
 #define	LDAP_BACK_AUTH_OVERRIDE		0x02U
 #define	LDAP_BACK_AUTH_PRESCRIPTIVE	0x04U
 
-	BerVarray	idassert_authz;
+	BerVarray	li_idassert_authz;
 	/* end of ID assert stuff */
 
-	int		nretries;
+	int		li_nretries;
 #define LDAP_BACK_RETRY_UNDEFINED	(-2)
 #define LDAP_BACK_RETRY_FOREVER		(-1)
 #define LDAP_BACK_RETRY_NEVER		(0)
 #define LDAP_BACK_RETRY_DEFAULT		(3)
 
-	ldap_pvt_thread_mutex_t		conn_mutex;
-	unsigned	flags;
+	unsigned	li_flags;
 #define LDAP_BACK_F_NONE		0x00U
 #define LDAP_BACK_F_SAVECRED		0x01U
 #define LDAP_BACK_F_USE_TLS		0x02U
@@ -163,23 +171,18 @@ struct ldapinfo {
 #define	LDAP_BACK_F_SUPPORT_T_F_DISCOVER	0x40U
 #define	LDAP_BACK_F_SUPPORT_T_F_MASK		(LDAP_BACK_F_SUPPORT_T_F|LDAP_BACK_F_SUPPORT_T_F_DISCOVER)
 
-#define LDAP_BACK_SAVECRED(li)		( (li)->flags & LDAP_BACK_F_SAVECRED )
-#define LDAP_BACK_USE_TLS(li)		( (li)->flags & LDAP_BACK_F_USE_TLS )
-#define LDAP_BACK_PROPAGATE_TLS(li)	( (li)->flags & LDAP_BACK_F_PROPAGATE_TLS )
-#define LDAP_BACK_TLS_CRITICAL(li)	( (li)->flags & LDAP_BACK_F_TLS_CRITICAL )
-#define LDAP_BACK_CHASE_REFERRALS(li)	( (li)->flags & LDAP_BACK_F_CHASE_REFERRALS )
+#define LDAP_BACK_SAVECRED(li)		( (li)->li_flags & LDAP_BACK_F_SAVECRED )
+#define LDAP_BACK_USE_TLS(li)		( (li)->li_flags & LDAP_BACK_F_USE_TLS )
+#define LDAP_BACK_PROPAGATE_TLS(li)	( (li)->li_flags & LDAP_BACK_F_PROPAGATE_TLS )
+#define LDAP_BACK_TLS_CRITICAL(li)	( (li)->li_flags & LDAP_BACK_F_TLS_CRITICAL )
+#define LDAP_BACK_CHASE_REFERRALS(li)	( (li)->li_flags & LDAP_BACK_F_CHASE_REFERRALS )
 
-	int		version;
+	int		li_version;
 
-	Avlnode		*conntree;
+	ldap_avl_info_t	li_conninfo;
 
-#if 0
-	/* FIXME: automatic rwm instantiation removed */
-	int		rwm_started;
-#endif
-
-	time_t			timeout[ LDAP_BACK_OP_LAST ];
-};
+	time_t		li_timeout[ LDAP_BACK_OP_LAST ];
+} ldapinfo_t;
 
 typedef enum ldap_back_send_t {
 	LDAP_BACK_DONTSEND		= 0x00,

servers/slapd/back-ldap/compare.c

@@ -36,7 +36,7 @@ ldap_back_compare(
 		Operation	*op,
 		SlapReply	*rs )
 {
-	struct ldapconn	*lc;
+	ldapconn_t	*lc;
 	ber_int_t	msgid;
 	int		do_retry = 1;
 	LDAPControl	**ctrls = NULL;
@@ -63,7 +63,7 @@ retry:
 	rc = ldap_back_op_result( lc, op, rs, msgid, 0, LDAP_BACK_SENDRESULT );
 	if ( rc == LDAP_UNAVAILABLE && do_retry ) {
 		do_retry = 0;
-		if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+		if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
 			goto retry;
 		}
 	}

servers/slapd/back-ldap/delete.c

@@ -36,9 +36,9 @@ ldap_back_delete(
 		Operation	*op,
 		SlapReply	*rs )
 {
-	struct ldapinfo	*li = (struct ldapinfo *)op->o_bd->be_private;
+	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
 
-	struct ldapconn	*lc;
+	ldapconn_t	*lc;
 	ber_int_t	msgid;
 	LDAPControl	**ctrls = NULL;
 	int		do_retry = 1;
@@ -62,10 +62,10 @@ retry:
 	rs->sr_err = ldap_delete_ext( lc->lc_ld, op->o_req_ndn.bv_val,
 			ctrls, NULL, &msgid );
 	rc = ldap_back_op_result( lc, op, rs, msgid,
-		li->timeout[ LDAP_BACK_OP_DELETE], LDAP_BACK_SENDRESULT );
+		li->li_timeout[ LDAP_BACK_OP_DELETE], LDAP_BACK_SENDRESULT );
 	if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {
 		do_retry = 0;
-		if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+		if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
 			goto retry;
 		}
 	}

servers/slapd/back-ldap/extended.c

@@ -48,7 +48,7 @@ ldap_back_extended(
 	for ( i = 0; exop_table[i].extended != NULL; i++ ) {
 		if ( bvmatch( &exop_table[i].oid, &op->oq_extended.rs_reqoid ) )
 		{
-			struct ldapconn	*lc;
+			ldapconn_t	*lc;
 			LDAPControl	**oldctrls = NULL;
 			int		rc;
 
@@ -98,7 +98,7 @@ ldap_back_exop_passwd(
 		Operation	*op,
 		SlapReply	*rs )
 {
-	struct ldapconn	*lc;
+	ldapconn_t	*lc;
 	req_pwdexop_s	*qpw = &op->oq_pwdexop;
 	LDAPMessage	*res;
 	ber_int_t	msgid;
@@ -124,7 +124,7 @@ retry:
 	if ( rc == LDAP_SUCCESS ) {
 		if ( ldap_result( lc->lc_ld, msgid, 1, NULL, &res ) == -1 ) {
 			ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
-			ldap_back_freeconn( op, lc );
+			ldap_back_freeconn( op, lc, 0 );
 			lc = NULL;
 
 		} else {
@@ -168,7 +168,7 @@ retry:
 		rs->sr_err = slap_map_api2result( rs );
 		if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
 			do_retry = 0;
-			if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+			if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
 				goto retry;
 			}
 		}

servers/slapd/back-ldap/init.c

@@ -80,45 +80,45 @@ ldap_back_initialize( BackendInfo *bi )
 int
 ldap_back_db_init( Backend *be )
 {
-	struct ldapinfo	*li;
+	ldapinfo_t	*li;
 
-	li = (struct ldapinfo *)ch_calloc( 1, sizeof( struct ldapinfo ) );
+	li = (ldapinfo_t *)ch_calloc( 1, sizeof( ldapinfo_t ) );
 	if ( li == NULL ) {
  		return -1;
  	}
 
-	BER_BVZERO( &li->acl_authcID );
-	BER_BVZERO( &li->acl_authcDN );
-	BER_BVZERO( &li->acl_passwd );
+	BER_BVZERO( &li->li_acl_authcID );
+	BER_BVZERO( &li->li_acl_authcDN );
+	BER_BVZERO( &li->li_acl_passwd );
 
-	li->acl_authmethod = LDAP_AUTH_NONE;
-	BER_BVZERO( &li->acl_sasl_mech );
-	li->acl_sb.sb_tls = SB_TLS_DEFAULT;
+	li->li_acl_authmethod = LDAP_AUTH_NONE;
+	BER_BVZERO( &li->li_acl_sasl_mech );
+	li->li_acl.sb_tls = SB_TLS_DEFAULT;
 
-	li->idassert_mode = LDAP_BACK_IDASSERT_LEGACY;
+	li->li_idassert_mode = LDAP_BACK_IDASSERT_LEGACY;
 
-	BER_BVZERO( &li->idassert_authcID );
-	BER_BVZERO( &li->idassert_authcDN );
-	BER_BVZERO( &li->idassert_passwd );
+	BER_BVZERO( &li->li_idassert_authcID );
+	BER_BVZERO( &li->li_idassert_authcDN );
+	BER_BVZERO( &li->li_idassert_passwd );
 
-	BER_BVZERO( &li->idassert_authzID );
+	BER_BVZERO( &li->li_idassert_authzID );
 
-	li->idassert_authmethod = LDAP_AUTH_NONE;
-	BER_BVZERO( &li->idassert_sasl_mech );
-	li->idassert_sb.sb_tls = SB_TLS_DEFAULT;
+	li->li_idassert_authmethod = LDAP_AUTH_NONE;
+	BER_BVZERO( &li->li_idassert_sasl_mech );
+	li->li_idassert.sb_tls = SB_TLS_DEFAULT;
 
 	/* by default, use proxyAuthz control on each operation */
-	li->idassert_flags = LDAP_BACK_AUTH_PRESCRIPTIVE;
+	li->li_idassert_flags = LDAP_BACK_AUTH_PRESCRIPTIVE;
 
-	li->idassert_authz = NULL;
+	li->li_idassert_authz = NULL;
 
 	/* initialize flags */
-	li->flags = LDAP_BACK_F_CHASE_REFERRALS;
+	li->li_flags = LDAP_BACK_F_CHASE_REFERRALS;
 
 	/* initialize version */
-	li->version = LDAP_VERSION3;
+	li->li_version = LDAP_VERSION3;
 
-	ldap_pvt_thread_mutex_init( &li->conn_mutex );
+	ldap_pvt_thread_mutex_init( &li->li_conninfo.lai_mutex );
 
 	be->be_private = li;
 	SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_NOLASTMOD;
@@ -131,19 +131,19 @@ ldap_back_db_init( Backend *be )
 int
 ldap_back_db_open( BackendDB *be )
 {
-	struct ldapinfo	*li = (struct ldapinfo *)be->be_private;
+	ldapinfo_t	*li = (ldapinfo_t *)be->be_private;
 
 	Debug( LDAP_DEBUG_TRACE,
 		"ldap_back_db_open: URI=%s\n",
-		li->url != NULL ? li->url : "", 0, 0 );
+		li->li_uri != NULL ? li->li_uri : "", 0, 0 );
 
 	/* by default, use proxyAuthz control on each operation */
-	switch ( li->idassert_mode ) {
+	switch ( li->li_idassert_mode ) {
 	case LDAP_BACK_IDASSERT_LEGACY:
 	case LDAP_BACK_IDASSERT_SELF:
 		/* however, since admin connections are pooled and shared,
 		 * only static authzIDs can be native */
-		li->idassert_flags &= ~LDAP_BACK_AUTH_NATIVE_AUTHZ;
+		li->li_idassert_flags &= ~LDAP_BACK_AUTH_NATIVE_AUTHZ;
 		break;
 
 	default:
@@ -159,7 +159,6 @@ ldap_back_db_open( BackendDB *be )
 		 * the normalized one.  See ITS#3406 */
 		struct berval	filter,
 				base = BER_BVC( "cn=Databases," SLAPD_MONITOR );
-		struct berval	vals[ 2 ];
 		Attribute	a = { 0 };
 
 		filter.bv_len = STRLENOF( "(&(namingContexts:distinguishedNameMatch:=)(monitoredInfo=ldap))" )
@@ -170,10 +169,8 @@ ldap_back_db_open( BackendDB *be )
 				be->be_nsuffix[ 0 ].bv_val );
 
 		a.a_desc = slap_schema.si_ad_labeledURI;
-		ber_str2bv( li->url, 0, 0, &vals[ 0 ] );
-		BER_BVZERO( &vals[ 1 ] );
-		a.a_vals = vals;
-		a.a_nvals = vals;
+		a.a_vals = li->li_bvuri;
+		a.a_nvals = li->li_bvuri;
 		if ( monitor_back_register_entry_attrs( NULL, &a, NULL, &base, LDAP_SCOPE_SUBTREE, &filter ) ) {
 			/* error */
 		}
@@ -182,16 +179,16 @@ ldap_back_db_open( BackendDB *be )
 	}
 #endif /* SLAPD_MONITOR */
 
-	if ( li->flags & LDAP_BACK_F_SUPPORT_T_F_DISCOVER ) {
+	if ( li->li_flags & LDAP_BACK_F_SUPPORT_T_F_DISCOVER ) {
 		int		rc;
 
-		li->flags &= ~LDAP_BACK_F_SUPPORT_T_F_DISCOVER;
+		li->li_flags &= ~LDAP_BACK_F_SUPPORT_T_F_DISCOVER;
 
-		rc = slap_discover_feature( li->url, li->version,
+		rc = slap_discover_feature( li->li_uri, li->li_version,
 				slap_schema.si_ad_supportedFeatures->ad_cname.bv_val,
 				LDAP_FEATURE_ABSOLUTE_FILTERS );
 		if ( rc == LDAP_COMPARE_TRUE ) {
-			li->flags |= LDAP_BACK_F_SUPPORT_T_F;
+			li->li_flags |= LDAP_BACK_F_SUPPORT_T_F;
 		}
 	}
 
@@ -201,7 +198,7 @@ ldap_back_db_open( BackendDB *be )
 void
 ldap_back_conn_free( void *v_lc )
 {
-	struct ldapconn	*lc = v_lc;
+	ldapconn_t	*lc = v_lc;
 
 	if ( lc->lc_ld != NULL ) {	
 		ldap_unbind_ext( lc->lc_ld, NULL, NULL );
@@ -224,75 +221,73 @@ ldap_back_db_destroy(
     Backend	*be
 )
 {
-	struct ldapinfo	*li;
-
 	if ( be->be_private ) {
-		li = ( struct ldapinfo * )be->be_private;
+		ldapinfo_t	*li = ( ldapinfo_t * )be->be_private;
 
-		ldap_pvt_thread_mutex_lock( &li->conn_mutex );
+		ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
 
-		if ( li->url != NULL ) {
-			ch_free( li->url );
-			li->url = NULL;
-		}
-		if ( li->lud ) {
-			ldap_free_urldesc( li->lud );
-			li->lud = NULL;
+		if ( li->li_uri != NULL ) {
+			ch_free( li->li_uri );
+			li->li_uri = NULL;
+
+			assert( li->li_bvuri != NULL );
+			ber_bvarray_free( li->li_bvuri );
+			li->li_bvuri = NULL;
 		}
-		if ( !BER_BVISNULL( &li->acl_authcID ) ) {
-			ch_free( li->acl_authcID.bv_val );
-			BER_BVZERO( &li->acl_authcID );
+		if ( !BER_BVISNULL( &li->li_acl_authcID ) ) {
+			ch_free( li->li_acl_authcID.bv_val );
+			BER_BVZERO( &li->li_acl_authcID );
 		}
-		if ( !BER_BVISNULL( &li->acl_authcDN ) ) {
-			ch_free( li->acl_authcDN.bv_val );
-			BER_BVZERO( &li->acl_authcDN );
+		if ( !BER_BVISNULL( &li->li_acl_authcDN ) ) {
+			ch_free( li->li_acl_authcDN.bv_val );
+			BER_BVZERO( &li->li_acl_authcDN );
 		}
-		if ( !BER_BVISNULL( &li->acl_passwd ) ) {
-			ch_free( li->acl_passwd.bv_val );
-			BER_BVZERO( &li->acl_passwd );
+		if ( !BER_BVISNULL( &li->li_acl_passwd ) ) {
+			ch_free( li->li_acl_passwd.bv_val );
+			BER_BVZERO( &li->li_acl_passwd );
 		}
-		if ( !BER_BVISNULL( &li->acl_sasl_mech ) ) {
-			ch_free( li->acl_sasl_mech.bv_val );
-			BER_BVZERO( &li->acl_sasl_mech );
+		if ( !BER_BVISNULL( &li->li_acl_sasl_mech ) ) {
+			ch_free( li->li_acl_sasl_mech.bv_val );
+			BER_BVZERO( &li->li_acl_sasl_mech );
 		}
-		if ( !BER_BVISNULL( &li->acl_sasl_realm ) ) {
-			ch_free( li->acl_sasl_realm.bv_val );
-			BER_BVZERO( &li->acl_sasl_realm );
+		if ( !BER_BVISNULL( &li->li_acl_sasl_realm ) ) {
+			ch_free( li->li_acl_sasl_realm.bv_val );
+			BER_BVZERO( &li->li_acl_sasl_realm );
 		}
-		if ( !BER_BVISNULL( &li->idassert_authcID ) ) {
-			ch_free( li->idassert_authcID.bv_val );
-			BER_BVZERO( &li->idassert_authcID );
+		if ( !BER_BVISNULL( &li->li_idassert_authcID ) ) {
+			ch_free( li->li_idassert_authcID.bv_val );
+			BER_BVZERO( &li->li_idassert_authcID );
 		}
-		if ( !BER_BVISNULL( &li->idassert_authcDN ) ) {
-			ch_free( li->idassert_authcDN.bv_val );
-			BER_BVZERO( &li->idassert_authcDN );
+		if ( !BER_BVISNULL( &li->li_idassert_authcDN ) ) {
+			ch_free( li->li_idassert_authcDN.bv_val );
+			BER_BVZERO( &li->li_idassert_authcDN );
 		}
-		if ( !BER_BVISNULL( &li->idassert_passwd ) ) {
-			ch_free( li->idassert_passwd.bv_val );
-			BER_BVZERO( &li->idassert_passwd );
+		if ( !BER_BVISNULL( &li->li_idassert_passwd ) ) {
+			ch_free( li->li_idassert_passwd.bv_val );
+			BER_BVZERO( &li->li_idassert_passwd );
 		}
-		if ( !BER_BVISNULL( &li->idassert_authzID ) ) {
-			ch_free( li->idassert_authzID.bv_val );
-			BER_BVZERO( &li->idassert_authzID );
+		if ( !BER_BVISNULL( &li->li_idassert_authzID ) ) {
+			ch_free( li->li_idassert_authzID.bv_val );
+			BER_BVZERO( &li->li_idassert_authzID );
 		}
-		if ( !BER_BVISNULL( &li->idassert_sasl_mech ) ) {
-			ch_free( li->idassert_sasl_mech.bv_val );
-			BER_BVZERO( &li->idassert_sasl_mech );
+		if ( !BER_BVISNULL( &li->li_idassert_sasl_mech ) ) {
+			ch_free( li->li_idassert_sasl_mech.bv_val );
+			BER_BVZERO( &li->li_idassert_sasl_mech );
 		}
-		if ( !BER_BVISNULL( &li->idassert_sasl_realm ) ) {
-			ch_free( li->idassert_sasl_realm.bv_val );
-			BER_BVZERO( &li->idassert_sasl_realm );
+		if ( !BER_BVISNULL( &li->li_idassert_sasl_realm ) ) {
+			ch_free( li->li_idassert_sasl_realm.bv_val );
+			BER_BVZERO( &li->li_idassert_sasl_realm );
 		}
-		if ( li->idassert_authz != NULL ) {
-			ber_bvarray_free( li->idassert_authz );
-			li->idassert_authz = NULL;
+		if ( li->li_idassert_authz != NULL ) {
+			ber_bvarray_free( li->li_idassert_authz );
+			li->li_idassert_authz = NULL;
 		}
-                if ( li->conntree ) {
-			avl_free( li->conntree, ldap_back_conn_free );
+               	if ( li->li_conninfo.lai_tree ) {
+			avl_free( li->li_conninfo.lai_tree, ldap_back_conn_free );
 		}
 
-		ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
-		ldap_pvt_thread_mutex_destroy( &li->conn_mutex );
+		ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+		ldap_pvt_thread_mutex_destroy( &li->li_conninfo.lai_mutex );
 	}
 
 	ch_free( be->be_private );

servers/slapd/back-ldap/modify.c

@@ -36,9 +36,9 @@ ldap_back_modify(
 		Operation	*op,
 		SlapReply	*rs )
 {
-	struct ldapinfo	*li = (struct ldapinfo *)op->o_bd->be_private;
+	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
 
-	struct ldapconn	*lc;
+	ldapconn_t	*lc;
 	LDAPMod		**modv = NULL,
 			*mods = NULL;
 	Modifications	*ml;
@@ -110,10 +110,10 @@ retry:
 	rs->sr_err = ldap_modify_ext( lc->lc_ld, op->o_req_ndn.bv_val, modv,
 			ctrls, NULL, &msgid );
 	rc = ldap_back_op_result( lc, op, rs, msgid,
-		li->timeout[ LDAP_BACK_OP_MODIFY], LDAP_BACK_SENDRESULT );
+		li->li_timeout[ LDAP_BACK_OP_MODIFY], LDAP_BACK_SENDRESULT );
 	if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
 		do_retry = 0;
-		if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+		if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
 			goto retry;
 		}
 	}

servers/slapd/back-ldap/modrdn.c

@@ -36,9 +36,9 @@ ldap_back_modrdn(
 		Operation	*op,
  		SlapReply	*rs )
 {
-	struct ldapinfo	*li = (struct ldapinfo *)op->o_bd->be_private;
+	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
 
-	struct ldapconn *lc;
+	ldapconn_t	*lc;
 	ber_int_t	msgid;
 	LDAPControl	**ctrls = NULL;
 	int		do_retry = 1;
@@ -70,10 +70,10 @@ retry:
 			op->orr_newrdn.bv_val, newSup,
 			op->orr_deleteoldrdn, ctrls, NULL, &msgid );
 	rc = ldap_back_op_result( lc, op, rs, msgid,
-		li->timeout[ LDAP_BACK_OP_MODRDN ], LDAP_BACK_SENDRESULT );
+		li->li_timeout[ LDAP_BACK_OP_MODRDN ], LDAP_BACK_SENDRESULT );
 	if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {
 		do_retry = 0;
-		if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+		if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
 			goto retry;
 		}
 	}

servers/slapd/back-ldap/proto-ldap.h

@@ -32,7 +32,6 @@ extern BI_destroy		ldap_back_destroy;
 extern BI_db_init		ldap_back_db_init;
 extern BI_db_open		ldap_back_db_open;
 extern BI_db_destroy		ldap_back_db_destroy;
-extern BI_db_config		ldap_back_db_config;
 
 extern BI_op_bind		ldap_back_bind;
 extern BI_op_search		ldap_back_search;
@@ -48,15 +47,14 @@ extern BI_connection_destroy	ldap_back_conn_destroy;
 
 extern BI_entry_get_rw		ldap_back_entry_get;
 
-int ldap_back_freeconn( Operation *op, struct ldapconn *lc );
-struct ldapconn *ldap_back_getconn(struct slap_op *op, struct slap_rep *rs, ldap_back_send_t sendok);
-void ldap_back_release_conn( struct slap_op *op, struct slap_rep *rs, struct ldapconn *lc );
-int ldap_back_dobind(struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok);
-int ldap_back_retry(struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok);
-int ldap_back_map_result(SlapReply *rs);
-int ldap_back_op_result(struct ldapconn *lc, Operation *op, SlapReply *rs,
-	ber_int_t msgid, time_t timeout, ldap_back_send_t sendok);
-int	back_ldap_LTX_init_module(int argc, char *argv[]);
+int ldap_back_freeconn( Operation *op, ldapconn_t *lc, int dolock );
+ldapconn_t *ldap_back_getconn( Operation *op, SlapReply *rs, ldap_back_send_t sendok );
+void ldap_back_release_conn( Operation *op, SlapReply *rs, ldapconn_t *lc );
+int ldap_back_dobind( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok );
+int ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok );
+int ldap_back_map_result( SlapReply *rs );
+int ldap_back_op_result( ldapconn_t *lc, Operation *op, SlapReply *rs,
+	ber_int_t msgid, time_t timeout, ldap_back_send_t sendok );
 
 int ldap_back_init_cf( BackendInfo *bi );
 
@@ -66,7 +64,7 @@ extern void ldap_back_conn_free( void *c );