X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fbind.c;h=eb3d49703b20f02acb6a5296f94625228998f7bb;hb=5cd816f4eb2fc09a59cc53267c731d91badcae97;hp=92018cf82370fb4a0af707cc9c689d0c765b7472;hpb=f8d1a618668499d9b0dbdb9e3cd24e2aa0bafa0f;p=openldap

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 92018cf823..eb3d49703b 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2007 The OpenLDAP Foundation.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -32,6 +32,8 @@
 #define AVL_INTERNAL
 #include "slap.h"
 #include "back-ldap.h"
+#undef ldap_debug	/* silence a warning in ldap-int.h */
+#include "../../../libraries/libldap/ldap-int.h"
 
 #include "lutil_ldap.h"
 
@@ -39,7 +41,7 @@
 
 #if LDAP_BACK_PRINT_CONNTREE > 0
 static void
-ravl_print( Avlnode *root, int depth )
+ldap_back_ravl_print( Avlnode *root, int depth )
 {
 	int		i;
 	ldapconn_t	*lc;
@@ -48,38 +50,70 @@ ravl_print( Avlnode *root, int depth )
 		return;
 	}
 	
-	ravl_print( root->avl_right, depth+1 );
+	ldap_back_ravl_print( root->avl_right, depth+1 );
 	
 	for ( i = 0; i < depth; i++ ) {
 		fprintf( stderr, "-" );
 	}
 
 	lc = root->avl_data;
-	fprintf( stderr, "lc=%p local=\"%s\" conn=%p %s refcnt=%d\n",
+	fprintf( stderr, "lc=%p local=\"%s\" conn=%p %s refcnt=%d flags=0x%08x\n",
 		(void *)lc,
 		lc->lc_local_ndn.bv_val ? lc->lc_local_ndn.bv_val : "",
 		(void *)lc->lc_conn,
-		avl_bf2str( root->avl_bf ), lc->lc_refcnt );
+		avl_bf2str( root->avl_bf ), lc->lc_refcnt, lc->lc_lcflags );
 	
-	ravl_print( root->avl_left, depth+1 );
+	ldap_back_ravl_print( root->avl_left, depth+1 );
 }
 
+static char* priv2str[] = {
+	"privileged",
+	"privileged/TLS",
+	"anonymous",
+	"anonymous/TLS",
+	"bind",
+	"bind/TLS",
+	NULL
+};
+
 void
-ldap_back_print_conntree( Avlnode *root, char *msg )
+ldap_back_print_conntree( ldapinfo_t *li, char *msg )
 {
+	int	c;
+
 	fprintf( stderr, "========> %s\n", msg );
+
+	for ( c = LDAP_BACK_PCONN_FIRST; c < LDAP_BACK_PCONN_LAST; c++ ) {
+		int		i = 0;
+		ldapconn_t	*lc;
+
+		fprintf( stderr, "  %s[%d]\n", priv2str[ c ], li->li_conn_priv[ c ].lic_num );
+
+		LDAP_TAILQ_FOREACH( lc, &li->li_conn_priv[ c ].lic_priv, lc_q )
+		{
+			fprintf( stderr, "    [%d] lc=%p local=\"%s\" conn=%p refcnt=%d flags=0x%08x\n",
+				i,
+				(void *)lc,
+				lc->lc_local_ndn.bv_val ? lc->lc_local_ndn.bv_val : "",
+				(void *)lc->lc_conn, lc->lc_refcnt, lc->lc_lcflags );
+			i++;
+		}
+	}
 	
-	if ( root == 0 ) {
+	if ( li->li_conninfo.lai_tree == 0 ) {
 		fprintf( stderr, "\t(empty)\n" );
 
 	} else {
-		ravl_print( root, 0 );
+		ldap_back_ravl_print( li->li_conninfo.lai_tree, 0 );
 	}
 	
 	fprintf( stderr, "<======== %s\n", msg );
 }
 #endif /* LDAP_BACK_PRINT_CONNTREE */
 
+static int
+ldap_back_freeconn( ldapinfo_t *li, ldapconn_t *lc, int dolock );
+
 static ldapconn_t *
 ldap_back_getconn( Operation *op, SlapReply *rs, ldap_back_send_t sendok,
 	struct berval *binddn, struct berval *bindcred );
@@ -93,50 +127,132 @@ ldap_back_proxy_authz_bind( ldapconn_t *lc, Operation *op, SlapReply *rs,
 	ldap_back_send_t sendok, struct berval *binddn, struct berval *bindcred );
 
 static int
-ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs,
+ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs,
 	ldap_back_send_t sendok );
 
 static int
 ldap_back_conndnlc_cmp( const void *c1, const void *c2 );
 
+ldapconn_t *
+ldap_back_conn_delete( ldapinfo_t *li, ldapconn_t *lc )
+{
+	if ( LDAP_BACK_PCONN_ISPRIV( lc ) ) {
+		if ( LDAP_BACK_CONN_CACHED( lc ) ) {
+			assert( lc->lc_q.tqe_prev != NULL );
+			assert( li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_num > 0 );
+			li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_num--;
+			LDAP_TAILQ_REMOVE( &li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_priv, lc, lc_q );
+			LDAP_TAILQ_ENTRY_INIT( lc, lc_q );
+			LDAP_BACK_CONN_CACHED_CLEAR( lc );
+
+		} else {
+			assert( LDAP_BACK_CONN_TAINTED( lc ) );
+			assert( lc->lc_q.tqe_prev == NULL );
+		}
+
+	} else {
+		ldapconn_t	*tmplc = NULL;
+
+		if ( LDAP_BACK_CONN_CACHED( lc ) ) {
+			assert( !LDAP_BACK_CONN_TAINTED( lc ) );
+			tmplc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)lc,
+				ldap_back_conndnlc_cmp );
+			assert( tmplc == lc );
+			LDAP_BACK_CONN_CACHED_CLEAR( lc );
+		}
+
+		assert( LDAP_BACK_CONN_TAINTED( lc ) || tmplc == lc );
+	}
+
+	return lc;
+}
+
 int
 ldap_back_bind( Operation *op, SlapReply *rs )
 {
-	ldapinfo_t	*li = (ldapinfo_t *) op->o_bd->be_private;
-	ldapconn_t	*lc;
+	ldapinfo_t		*li = (ldapinfo_t *) op->o_bd->be_private;
+	ldapconn_t		*lc;
 
-	int rc = 0;
-	ber_int_t msgid;
+	LDAPControl		**ctrls = NULL;
+	struct berval		save_o_dn;
+	int			save_o_do_not_cache,
+				rc = 0;
+	ber_int_t		msgid;
+	ldap_back_send_t	retrying = LDAP_BACK_RETRYING;
+
+	/* allow rootdn as a means to auth without the need to actually
+ 	 * contact the proxied DSA */
+	switch ( be_rootdn_bind( op, rs ) ) {
+	case SLAP_CB_CONTINUE:
+		break;
+
+	default:
+		return rs->sr_err;
+	}
 
 	lc = ldap_back_getconn( op, rs, LDAP_BACK_BIND_SERR, NULL, NULL );
 	if ( !lc ) {
 		return rs->sr_err;
 	}
 
+	/* we can do (almost) whatever we want with this conn,
+	 * because either it's temporary, or it's marked as binding */
 	if ( !BER_BVISNULL( &lc->lc_bound_ndn ) ) {
 		ch_free( lc->lc_bound_ndn.bv_val );
 		BER_BVZERO( &lc->lc_bound_ndn );
 	}
+	if ( !BER_BVISNULL( &lc->lc_cred ) ) {
+		memset( lc->lc_cred.bv_val, 0, lc->lc_cred.bv_len );
+		ch_free( lc->lc_cred.bv_val );
+		BER_BVZERO( &lc->lc_cred );
+	}
 	LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
 
+	/* don't add proxyAuthz; set the bindDN */
+	save_o_dn = op->o_dn;
+	save_o_do_not_cache = op->o_do_not_cache;
+	op->o_dn = op->o_req_dn;
+	op->o_do_not_cache = 1;
+
+	ctrls = op->o_ctrls;
+	rc = ldap_back_controls_add( op, rs, lc, &ctrls );
+	op->o_dn = save_o_dn;
+	op->o_do_not_cache = save_o_do_not_cache;
+	if ( rc != LDAP_SUCCESS ) {
+		send_ldap_result( op, rs );
+		ldap_back_release_conn( li, lc );
+		return( rc );
+	}
+
+retry:;
 	/* method is always LDAP_AUTH_SIMPLE if we got here */
 	rs->sr_err = ldap_sasl_bind( lc->lc_ld, op->o_req_dn.bv_val,
 			LDAP_SASL_SIMPLE,
-			&op->orb_cred, op->o_ctrls, NULL, &msgid );
+			&op->orb_cred, ctrls, NULL, &msgid );
+	/* FIXME: should we always retry, or only when piping the bind
+	 * in the "override" connection pool? */
 	rc = ldap_back_op_result( lc, op, rs, msgid,
 		li->li_timeout[ SLAP_OP_BIND ],
-		LDAP_BACK_BIND_SERR );
+		LDAP_BACK_BIND_SERR | retrying );
+	if ( rc == LDAP_UNAVAILABLE && retrying ) {
+		retrying &= ~LDAP_BACK_RETRYING;
+		if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_BIND_SERR ) ) {
+			goto retry;
+		}
+	}
+
+	ldap_back_controls_free( op, rs, &ctrls );
+
 	if ( rc == LDAP_SUCCESS ) {
 		/* If defined, proxyAuthz will be used also when
 		 * back-ldap is the authorizing backend; for this
 		 * purpose, after a successful bind the connection
-		 * is trashed and further operations will use
-		 * a default connections with identity assertion */
+		 * is left for further binds, and further operations 
+		 * on this client connection will use a default
+		 * connection with identity assertion */
 		/* NOTE: use with care */
 		if ( li->li_idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) {
-			LDAP_BACK_CONN_TAINTED_SET( lc );
-			ldap_back_release_conn( op, rs, lc );
-
+			ldap_back_release_conn( li, lc );
 			return( rc );
 		}
 
@@ -145,23 +261,24 @@ ldap_back_bind( Operation *op, SlapReply *rs )
 		LDAP_BACK_CONN_ISBOUND_SET( lc );
 		ber_dupbv( &lc->lc_bound_ndn, &op->o_req_ndn );
 
+		if ( !BER_BVISNULL( &lc->lc_cred ) ) {
+			memset( lc->lc_cred.bv_val, 0,
+					lc->lc_cred.bv_len );
+		}
+
 		if ( LDAP_BACK_SAVECRED( li ) ) {
-			if ( !BER_BVISNULL( &lc->lc_cred ) ) {
-				memset( lc->lc_cred.bv_val, 0,
-						lc->lc_cred.bv_len );
-			}
 			ber_bvreplace( &lc->lc_cred, &op->orb_cred );
 			ldap_set_rebind_proc( lc->lc_ld, li->li_rebind_f, lc );
+
+		} else {
+			lc->lc_cred.bv_len = 0;
 		}
 	}
 
-	assert( lc->lc_binding == 1 );
-	lc->lc_binding = 0;
-
 	/* must re-insert if local DN changed as result of bind */
 	if ( !LDAP_BACK_CONN_ISBOUND( lc )
-		|| ( LDAP_BACK_CONN_ISBOUND( lc )
-			&& !dn_match( &op->o_req_ndn, &lc->lc_local_ndn ) ) )
+		|| ( !dn_match( &op->o_req_ndn, &lc->lc_local_ndn )
+			&& !LDAP_BACK_PCONN_ISPRIV( lc ) ) )
 	{
 		int		lerr = -1;
 		ldapconn_t	*tmplc;
@@ -176,13 +293,11 @@ retry_lock:;
 		}
 
 #if LDAP_BACK_PRINT_CONNTREE > 0
-		ldap_back_print_conntree( li->li_conninfo.lai_tree, ">>> ldap_back_bind" );
+		ldap_back_print_conntree( li, ">>> ldap_back_bind" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
-	
+
 		assert( lc->lc_refcnt == 1 );
-		tmplc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)lc,
-				ldap_back_conndnlc_cmp );
-		assert( tmplc == NULL || lc == tmplc );
+		ldap_back_conn_delete( li, lc );
 
 		/* delete all cached connections with the current connection */
 		if ( LDAP_BACK_SINGLECONN( li ) ) {
@@ -195,6 +310,7 @@ retry_lock:;
 				if ( tmplc->lc_refcnt != 0 ) {
 					/* taint it */
 					LDAP_BACK_CONN_TAINTED_SET( tmplc );
+					LDAP_BACK_CONN_CACHED_CLEAR( tmplc );
 
 				} else {
 					/*
@@ -210,19 +326,20 @@ retry_lock:;
 		if ( LDAP_BACK_CONN_ISBOUND( lc ) ) {
 			ber_bvreplace( &lc->lc_local_ndn, &op->o_req_ndn );
 			if ( be_isroot_dn( op->o_bd, &op->o_req_ndn ) ) {
-				lc->lc_conn = LDAP_BACK_PCONN_SET( op );
+				LDAP_BACK_PCONN_ROOTDN_SET( lc, op );
 			}
 			lerr = avl_insert( &li->li_conninfo.lai_tree, (caddr_t)lc,
 				ldap_back_conndn_cmp, ldap_back_conndn_dup );
 		}
 
 #if LDAP_BACK_PRINT_CONNTREE > 0
-		ldap_back_print_conntree( li->li_conninfo.lai_tree, "<<< ldap_back_bind" );
+		ldap_back_print_conntree( li, "<<< ldap_back_bind" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
 	
 		ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 		switch ( lerr ) {
 		case 0:
+			LDAP_BACK_CONN_CACHED_SET( lc );
 			break;
 
 		case -1:
@@ -235,7 +352,7 @@ retry_lock:;
 	}
 
 	if ( lc != NULL ) {
-		ldap_back_release_conn( op, rs, lc );
+		ldap_back_release_conn( li, lc );
 	}
 
 	return( rc );
@@ -336,29 +453,25 @@ ldap_back_conndn_dup( void *c1, void *c2 )
 	return 0;
 }
 
-int
-ldap_back_freeconn( Operation *op, ldapconn_t *lc, int dolock )
+static int
+ldap_back_freeconn( ldapinfo_t *li, ldapconn_t *lc, int dolock )
 {
-	ldapinfo_t	*li = (ldapinfo_t *) op->o_bd->be_private;
-	ldapconn_t	*tmplc;
-
 	if ( dolock ) {
 		ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
 	}
 
 #if LDAP_BACK_PRINT_CONNTREE > 0
-	ldap_back_print_conntree( li->li_conninfo.lai_tree, ">>> ldap_back_freeconn" );
+	ldap_back_print_conntree( li, ">>> ldap_back_freeconn" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
 
-	tmplc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)lc,
-			ldap_back_conndnlc_cmp );
-	assert( LDAP_BACK_CONN_TAINTED( lc ) || tmplc == lc );
+	(void)ldap_back_conn_delete( li, lc );
+
 	if ( lc->lc_refcnt == 0 ) {
 		ldap_back_conn_free( (void *)lc );
 	}
 
 #if LDAP_BACK_PRINT_CONNTREE > 0
-	ldap_back_print_conntree( li->li_conninfo.lai_tree, "<<< ldap_back_freeconn" );
+	ldap_back_print_conntree( li, "<<< ldap_back_freeconn" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
 
 	if ( dolock ) {
@@ -380,13 +493,9 @@ ldap_back_start_tls(
 	const char	**text )
 {
 	int		rc = LDAP_SUCCESS;
-	ldapinfo_t	dummy;
-
-	/* this is ridiculous... */
-	dummy.li_flags = flags;
 
 	/* start TLS ("tls-[try-]{start,propagate}" statements) */
-	if ( ( LDAP_BACK_USE_TLS( &dummy ) || ( *is_tls && LDAP_BACK_PROPAGATE_TLS( &dummy ) ) )
+	if ( ( LDAP_BACK_USE_TLS_F( flags ) || ( *is_tls && LDAP_BACK_PROPAGATE_TLS_F( flags ) ) )
 				&& !ldap_is_ldaps_url( url ) )
 	{
 #ifdef SLAP_STARTTLS_ASYNCHRONOUS
@@ -495,7 +604,7 @@ retry:;
 			break;
 
 		default:
-			if ( LDAP_BACK_TLS_CRITICAL( &dummy ) ) {
+			if ( LDAP_BACK_TLS_CRITICAL_F( flags ) ) {
 				*text = "could not start TLS";
 				break;
 			}
@@ -515,7 +624,7 @@ retry:;
 #endif /* HAVE_TLS */
 
 static int
-ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
 {
 	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
 	int		version;
@@ -523,10 +632,9 @@ ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_bac
 #ifdef HAVE_TLS
 	int		is_tls = op->o_conn->c_is_tls;
 	time_t		lc_time = (time_t)(-1);
+	slap_bindconf *sb;
 #endif /* HAVE_TLS */
 
-	assert( lcp != NULL );
-
 	ldap_pvt_thread_mutex_lock( &li->li_uri_mutex );
 	rs->sr_err = ldap_initialize( &ld, li->li_uri );
 	ldap_pvt_thread_mutex_unlock( &li->li_uri_mutex );
@@ -566,12 +674,29 @@ ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_bac
 	}
 
 #ifdef HAVE_TLS
+	if ( LDAP_BACK_CONN_ISPRIV( lc ) ) {
+		sb = &li->li_acl;
+
+	} else if ( LDAP_BACK_CONN_ISIDASSERT( lc ) ) {
+		sb = &li->li_idassert.si_bc;
+
+	} else {
+		sb = &li->li_tls;
+	}
+
+	if ( sb->sb_tls_do_init ) {
+		bindconf_tls_set( sb, ld );
+	} else if ( sb->sb_tls_ctx ) {
+		ldap_set_option( ld, LDAP_OPT_X_TLS_CTX, sb->sb_tls_ctx );
+	}
+
 	ldap_pvt_thread_mutex_lock( &li->li_uri_mutex );
 	rs->sr_err = ldap_back_start_tls( ld, op->o_protocol, &is_tls,
 			li->li_uri, li->li_flags, li->li_nretries, &rs->sr_text );
 	ldap_pvt_thread_mutex_unlock( &li->li_uri_mutex );
 	if ( rs->sr_err != LDAP_SUCCESS ) {
 		ldap_unbind_ext( ld, NULL, NULL );
+		rs->sr_text = "Start TLS failed";
 		goto error_return;
 
 	} else if ( li->li_idle_timeout ) {
@@ -580,21 +705,16 @@ ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_bac
 	}
 #endif /* HAVE_TLS */
 
-	if ( *lcp == NULL ) {
-		*lcp = (ldapconn_t *)ch_calloc( 1, sizeof( ldapconn_t ) );
-		(*lcp)->lc_flags = li->li_flags;
-	}
-	(*lcp)->lc_ld = ld;
-	(*lcp)->lc_refcnt = 1;
-	(*lcp)->lc_binding = 1;
+	lc->lc_ld = ld;
+	lc->lc_refcnt = 1;
 #ifdef HAVE_TLS
 	if ( is_tls ) {
-		LDAP_BACK_CONN_ISTLS_SET( *lcp );
+		LDAP_BACK_CONN_ISTLS_SET( lc );
 	} else {
-		LDAP_BACK_CONN_ISTLS_CLEAR( *lcp );
+		LDAP_BACK_CONN_ISTLS_CLEAR( lc );
 	}
 	if ( lc_time != (time_t)(-1) ) {
-		(*lcp)->lc_time = lc_time;
+		lc->lc_time = lc_time;
 	}
 #endif /* HAVE_TLS */
 
@@ -603,15 +723,14 @@ error_return:;
 		rs->sr_err = slap_map_api2result( rs );
 		if ( sendok & LDAP_BACK_SENDERR ) {
 			if ( rs->sr_text == NULL ) {
-				rs->sr_text = "ldap_initialize() failed";
+				rs->sr_text = "Proxy connection initialization failed";
 			}
 			send_ldap_result( op, rs );
-			rs->sr_text = NULL;
 		}
 
 	} else {
 		if ( li->li_conn_ttl > 0 ) {
-			(*lcp)->lc_create_time = op->o_time;
+			lc->lc_create_time = op->o_time;
 		}
 	}
 
@@ -630,7 +749,7 @@ ldap_back_getconn(
 	ldapconn_t	*lc = NULL,
 			lc_curr = { 0 };
 	int		refcnt = 1,
-			binding = 1;
+			lookupconn = !( sendok & LDAP_BACK_BINDING );
 
 	/* if the server is quarantined, and
 	 * - the current interval did not expire yet, or
@@ -640,23 +759,26 @@ ldap_back_getconn(
 		slap_retry_info_t	*ri = &li->li_quarantine;
 		int			dont_retry = 1;
 
-		ldap_pvt_thread_mutex_lock( &li->li_quarantine_mutex );
-		if ( li->li_isquarantined == LDAP_BACK_FQ_YES ) {
-			dont_retry = ( ri->ri_num[ ri->ri_idx ] == SLAP_RETRYNUM_TAIL
-				|| slap_get_time() < ri->ri_last + ri->ri_interval[ ri->ri_idx ] );
-			if ( !dont_retry ) {
-				Debug( LDAP_DEBUG_ANY,
-					"%s: ldap_back_getconn quarantine "
-					"retry block #%d try #%d.\n",
-					op->o_log_prefix, ri->ri_idx, ri->ri_count );
-				li->li_isquarantined = LDAP_BACK_FQ_RETRYING;
+		if ( li->li_quarantine.ri_interval ) {
+			ldap_pvt_thread_mutex_lock( &li->li_quarantine_mutex );
+			if ( li->li_isquarantined == LDAP_BACK_FQ_YES ) {
+				dont_retry = ( ri->ri_num[ ri->ri_idx ] == SLAP_RETRYNUM_TAIL
+					|| slap_get_time() < ri->ri_last + ri->ri_interval[ ri->ri_idx ] );
+				if ( !dont_retry ) {
+					Debug( LDAP_DEBUG_ANY,
+						"%s: ldap_back_getconn quarantine "
+						"retry block #%d try #%d.\n",
+						op->o_log_prefix, ri->ri_idx, ri->ri_count );
+					li->li_isquarantined = LDAP_BACK_FQ_RETRYING;
+				}
 			}
+			ldap_pvt_thread_mutex_unlock( &li->li_quarantine_mutex );
 		}
-		ldap_pvt_thread_mutex_unlock( &li->li_quarantine_mutex );
 
 		if ( dont_retry ) {
 			rs->sr_err = LDAP_UNAVAILABLE;
 			if ( op->o_conn && ( sendok & LDAP_BACK_SENDERR ) ) {
+				rs->sr_text = "Target is quarantined";
 				send_ldap_result( op, rs );
 			}
 			return NULL;
@@ -667,56 +789,136 @@ ldap_back_getconn(
 	if ( op->o_do_not_cache || be_isroot( op ) ) {
 		LDAP_BACK_CONN_ISPRIV_SET( &lc_curr );
 		lc_curr.lc_local_ndn = op->o_bd->be_rootndn;
-		lc_curr.lc_conn = LDAP_BACK_PCONN_SET( op );
+		LDAP_BACK_PCONN_ROOTDN_SET( &lc_curr, op );
 
 	} else {
-		lc_curr.lc_local_ndn = op->o_ndn;
-		/* Explicit binds must not be shared */
+		struct berval	tmpbinddn,
+				tmpbindcred,
+				save_o_dn,
+				save_o_ndn;
+		int		isproxyauthz;
+
+		/* need cleanup */
+		if ( binddn == NULL ) {
+			binddn = &tmpbinddn;
+		}	
+		if ( bindcred == NULL ) {
+			bindcred = &tmpbindcred;
+		}
+		if ( op->o_tag == LDAP_REQ_BIND ) {
+			save_o_dn = op->o_dn;
+			save_o_ndn = op->o_ndn;
+			op->o_dn = op->o_req_dn;
+			op->o_ndn = op->o_req_ndn;
+		}
+		isproxyauthz = ldap_back_is_proxy_authz( op, rs, sendok, binddn, bindcred );
 		if ( op->o_tag == LDAP_REQ_BIND ) {
+			op->o_dn = save_o_dn;
+			op->o_ndn = save_o_ndn;
+		}
+		if ( isproxyauthz == -1 ) {
+			return NULL;
+		}
+
+		lc_curr.lc_local_ndn = op->o_ndn;
+		/* Explicit binds must not be shared;
+		 * however, explicit binds are piped in a special connection
+		 * when idassert is to occur with "override" set */
+		if ( op->o_tag == LDAP_REQ_BIND && !isproxyauthz ) {
 			lc_curr.lc_conn = op->o_conn;
 
 		} else {
-			if ( !( sendok & LDAP_BACK_BINDING ) && 
-				ldap_back_is_proxy_authz( op, rs, sendok, binddn, bindcred ) )
-			{
+			if ( isproxyauthz && !( sendok & LDAP_BACK_BINDING ) ) {
 				lc_curr.lc_local_ndn = *binddn;
-				lc_curr.lc_conn = LDAP_BACK_PCONN_SET( op );
+				LDAP_BACK_PCONN_ROOTDN_SET( &lc_curr, op );
+				LDAP_BACK_CONN_ISIDASSERT_SET( &lc_curr );
+
+			} else if ( isproxyauthz && ( li->li_idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) ) {
+				lc_curr.lc_local_ndn = slap_empty_bv;
+				LDAP_BACK_PCONN_BIND_SET( &lc_curr, op );
 				LDAP_BACK_CONN_ISIDASSERT_SET( &lc_curr );
+				lookupconn = 1;
 
 			} else if ( SLAP_IS_AUTHZ_BACKEND( op ) ) {
 				lc_curr.lc_conn = op->o_conn;
 
 			} else {
-				lc_curr.lc_conn = LDAP_BACK_PCONN_SET( op );
+				LDAP_BACK_PCONN_ANON_SET( &lc_curr, op );
 			}
 		}
 	}
 
 	/* Explicit Bind requests always get their own conn */
-	if ( !( sendok & LDAP_BACK_BINDING ) ) {
-		/* Searches for a ldapconn in the avl tree */
+	if ( lookupconn ) {
 retry_lock:
 		ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+		if ( LDAP_BACK_PCONN_ISPRIV( &lc_curr ) ) {
+			/* lookup a conn that's not binding */
+			LDAP_TAILQ_FOREACH( lc,
+				&li->li_conn_priv[ LDAP_BACK_CONN2PRIV( &lc_curr ) ].lic_priv,
+				lc_q )
+			{
+				if ( !LDAP_BACK_CONN_BINDING( lc ) && lc->lc_refcnt == 0 ) {
+					break;
+				}
+			}
+
+			if ( lc != NULL ) {
+				if ( lc != LDAP_TAILQ_LAST( &li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_priv,
+					ldapconn_t, lc_q ) )
+				{
+					LDAP_TAILQ_REMOVE( &li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_priv,
+						lc, lc_q );
+					LDAP_TAILQ_ENTRY_INIT( lc, lc_q );
+					LDAP_TAILQ_INSERT_TAIL( &li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_priv,
+						lc, lc_q );
+				}
+
+			} else if ( !LDAP_BACK_USE_TEMPORARIES( li )
+				&& li->li_conn_priv[ LDAP_BACK_CONN2PRIV( &lc_curr ) ].lic_num == li->li_conn_priv_max )
+			{
+				lc = LDAP_TAILQ_FIRST( &li->li_conn_priv[ LDAP_BACK_CONN2PRIV( &lc_curr ) ].lic_priv );
+			}
+			
+		} else {
+
+			/* Searches for a ldapconn in the avl tree */
+			lc = (ldapconn_t *)avl_find( li->li_conninfo.lai_tree, 
+					(caddr_t)&lc_curr, ldap_back_conndn_cmp );
+		}
 
-		lc = (ldapconn_t *)avl_find( li->li_conninfo.lai_tree, 
-				(caddr_t)&lc_curr, ldap_back_conndn_cmp );
 		if ( lc != NULL ) {
 			/* Don't reuse connections while they're still binding */
 			if ( LDAP_BACK_CONN_BINDING( lc ) ) {
-				ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
-				ldap_pvt_thread_yield();
-				goto retry_lock;
+				if ( !LDAP_BACK_USE_TEMPORARIES( li ) ) {
+					ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+
+					ldap_pvt_thread_yield();
+					goto retry_lock;
+				}
+				lc = NULL;
 			}
 
-			refcnt = ++lc->lc_refcnt;
-			binding = ++lc->lc_binding;
+			if ( lc != NULL ) {
+				if ( op->o_tag == LDAP_REQ_BIND ) {
+					/* right now, this is the only possible case */
+					assert( ( li->li_idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) );
+					LDAP_BACK_CONN_BINDING_SET( lc );
+				}
+
+				refcnt = ++lc->lc_refcnt;
+			}
 		}
 		ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 	}
 
 	/* Looks like we didn't get a bind. Open a new session... */
 	if ( lc == NULL ) {
-		if ( ldap_back_prepare_conn( &lc, op, rs, sendok ) != LDAP_SUCCESS ) {
+		lc = (ldapconn_t *)ch_calloc( 1, sizeof( ldapconn_t ) );
+		lc->lc_flags = li->li_flags;
+		lc->lc_lcflags = lc_curr.lc_lcflags;
+		if ( ldap_back_prepare_conn( lc, op, rs, sendok ) != LDAP_SUCCESS ) {
+			ch_free( lc );
 			return NULL;
 		}
 
@@ -751,8 +953,10 @@ retry_lock:
 			LDAP_BACK_CONN_ISPRIV_SET( lc );
 
 		} else if ( LDAP_BACK_CONN_ISIDASSERT( &lc_curr ) ) {
-			ber_dupbv( &lc->lc_bound_ndn, &li->li_idassert_authcDN );
-			ber_dupbv( &lc->lc_cred, &li->li_idassert_passwd );
+			if ( !LDAP_BACK_PCONN_ISBIND( &lc_curr ) ) {
+				ber_dupbv( &lc->lc_bound_ndn, &li->li_idassert_authcDN );
+				ber_dupbv( &lc->lc_cred, &li->li_idassert_passwd );
+			}
 			LDAP_BACK_CONN_ISIDASSERT_SET( lc );
 
 		} else {
@@ -770,18 +974,24 @@ retry_lock:
 		 * check if the non-TLS connection was already
 		 * in cache; in case, destroy the newly created
 		 * connection and use the existing one */
-		if ( lc->lc_conn == LDAP_BACK_PCONN_TLS
+		if ( LDAP_BACK_PCONN_ISTLS( lc ) 
 				&& !ldap_tls_inplace( lc->lc_ld ) )
 		{
-			ldapconn_t *tmplc;
+			ldapconn_t	*tmplc = NULL;
+			int		idx = LDAP_BACK_CONN2PRIV( &lc_curr ) - 1;
 			
-			lc_curr.lc_conn = LDAP_BACK_PCONN;
 			ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
-			tmplc = (ldapconn_t *)avl_find( li->li_conninfo.lai_tree, 
-					(caddr_t)&lc_curr, ldap_back_conndn_cmp );
+			LDAP_TAILQ_FOREACH( tmplc,
+				&li->li_conn_priv[ idx ].lic_priv,
+				lc_q )
+			{
+				if ( !LDAP_BACK_CONN_BINDING( tmplc ) ) {
+					break;
+				}
+			}
+
 			if ( tmplc != NULL ) {
 				refcnt = ++tmplc->lc_refcnt;
-				binding = ++tmplc->lc_binding;
 				ldap_back_conn_free( lc );
 				lc = tmplc;
 			}
@@ -793,63 +1003,81 @@ retry_lock:
 		}
 #endif /* HAVE_TLS */
 
-		LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
-
 		/* Inserts the newly created ldapconn in the avl tree */
 		ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
 
+		LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
+
+		assert( lc->lc_refcnt == 1 );
+
 #if LDAP_BACK_PRINT_CONNTREE > 0
-		ldap_back_print_conntree( li->li_conninfo.lai_tree, ">>> ldap_back_getconn(insert)" );
+		ldap_back_print_conntree( li, ">>> ldap_back_getconn(insert)" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
 	
-		assert( lc->lc_refcnt == 1 );
-		assert( lc->lc_binding == 1 );
-		rs->sr_err = avl_insert( &li->li_conninfo.lai_tree, (caddr_t)lc,
-			ldap_back_conndn_cmp, ldap_back_conndn_dup );
+		if ( LDAP_BACK_PCONN_ISPRIV( lc ) ) {
+			if ( li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_num < li->li_conn_priv_max ) {
+				LDAP_TAILQ_INSERT_TAIL( &li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_priv, lc, lc_q );
+				li->li_conn_priv[ LDAP_BACK_CONN2PRIV( lc ) ].lic_num++;
+				LDAP_BACK_CONN_CACHED_SET( lc );
+
+			} else {
+				LDAP_BACK_CONN_TAINTED_SET( lc );
+			}
+			rs->sr_err = 0;
+
+		} else {
+			rs->sr_err = avl_insert( &li->li_conninfo.lai_tree, (caddr_t)lc,
+				ldap_back_conndn_cmp, ldap_back_conndn_dup );
+			LDAP_BACK_CONN_CACHED_SET( lc );
+		}
 
 #if LDAP_BACK_PRINT_CONNTREE > 0
-		ldap_back_print_conntree( li->li_conninfo.lai_tree, "<<< ldap_back_getconn(insert)" );
+		ldap_back_print_conntree( li, "<<< ldap_back_getconn(insert)" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
 	
 		ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 
-		Debug( LDAP_DEBUG_TRACE,
-			"=>ldap_back_getconn: conn %p inserted refcnt=%u binding=%u\n",
-			(void *)lc, refcnt, binding );
+		if ( LogTest( LDAP_DEBUG_TRACE ) ) {
+			char	buf[ SLAP_TEXT_BUFLEN ];
+
+			snprintf( buf, sizeof( buf ),
+				"lc=%p inserted refcnt=%u rc=%d",
+				(void *)lc, refcnt, rs->sr_err );
+				
+			Debug( LDAP_DEBUG_TRACE,
+				"=>ldap_back_getconn: %s: %s\n",
+				op->o_log_prefix, buf, 0 );
+		}
 	
-		/* Err could be -1 in case a duplicate ldapconn is inserted */
-		switch ( rs->sr_err ) {
-		case 0:
-			break;
+		if ( !LDAP_BACK_PCONN_ISPRIV( lc ) ) {
+			/* Err could be -1 in case a duplicate ldapconn is inserted */
+			switch ( rs->sr_err ) {
+			case 0:
+				break;
 
-		case -1:
-			if ( !( sendok & LDAP_BACK_BINDING ) ) {
-				/* duplicate: free and try to get the newly created one */
-				goto retry_lock;
-			}
-			/* taint connection, so that it'll be freed when released */
-			ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
-#if LDAP_BACK_PRINT_CONNTREE > 0
-			ldap_back_print_conntree( li->li_conninfo.lai_tree, ">>> ldap_back_getconn(delete)" );
-#endif /* LDAP_BACK_PRINT_CONNTREE */
-			(void *)avl_delete( &li->li_conninfo.lai_tree, (caddr_t)lc,
-					ldap_back_conndnlc_cmp );
-#if LDAP_BACK_PRINT_CONNTREE > 0
-			ldap_back_print_conntree( li->li_conninfo.lai_tree, "<<< ldap_back_getconn(delete)" );
-#endif /* LDAP_BACK_PRINT_CONNTREE */
-			ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
-			LDAP_BACK_CONN_TAINTED_SET( lc );
-			break;
+			case -1:
+				LDAP_BACK_CONN_CACHED_CLEAR( lc );
+				if ( !( sendok & LDAP_BACK_BINDING ) && !LDAP_BACK_USE_TEMPORARIES( li ) ) {
+					/* duplicate: free and try to get the newly created one */
+					ldap_back_conn_free( lc );
+					lc = NULL;
+					goto retry_lock;
+				}
 
-		default:
-			ldap_back_conn_free( lc );
-			rs->sr_err = LDAP_OTHER;
-			rs->sr_text = "proxy bind collision";
-			if ( op->o_conn && ( sendok & LDAP_BACK_SENDERR ) ) {
-				send_ldap_result( op, rs );
-				rs->sr_text = NULL;
+				/* taint connection, so that it'll be freed when released */
+				LDAP_BACK_CONN_TAINTED_SET( lc );
+				break;
+
+			default:
+				LDAP_BACK_CONN_CACHED_CLEAR( lc );
+				ldap_back_conn_free( lc );
+				rs->sr_err = LDAP_OTHER;
+				rs->sr_text = "Proxy bind collision";
+				if ( op->o_conn && ( sendok & LDAP_BACK_SENDERR ) ) {
+					send_ldap_result( op, rs );
+				}
+				return NULL;
 			}
-			return NULL;
 		}
 
 	} else {
@@ -863,24 +1091,28 @@ retry_lock:
 			/* let it be used, but taint/delete it so that 
 			 * no-one else can look it up any further */
 			ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+
 #if LDAP_BACK_PRINT_CONNTREE > 0
-			ldap_back_print_conntree( li->li_conninfo.lai_tree, ">>> ldap_back_getconn(timeout)" );
+			ldap_back_print_conntree( li, ">>> ldap_back_getconn(timeout)" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
-			(void *)avl_delete( &li->li_conninfo.lai_tree, (caddr_t)lc,
-					ldap_back_conndnlc_cmp );
+
+			(void)ldap_back_conn_delete( li, lc );
+			LDAP_BACK_CONN_TAINTED_SET( lc );
+
 #if LDAP_BACK_PRINT_CONNTREE > 0
-			ldap_back_print_conntree( li->li_conninfo.lai_tree, "<<< ldap_back_getconn(timeout)" );
+			ldap_back_print_conntree( li, "<<< ldap_back_getconn(timeout)" );
 #endif /* LDAP_BACK_PRINT_CONNTREE */
+
 			ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
-			LDAP_BACK_CONN_TAINTED_SET( lc );
 		}
 
 		if ( LogTest( LDAP_DEBUG_TRACE ) ) {
 			char	buf[ SLAP_TEXT_BUFLEN ];
 
 			snprintf( buf, sizeof( buf ),
-				"conn %p fetched refcnt=%u binding=%u%s",
-				(void *)lc, refcnt, binding, expiring ? " expiring" : "" );
+				"conn %p fetched refcnt=%u%s",
+				(void *)lc, refcnt,
+				expiring ? " expiring" : "" );
 			Debug( LDAP_DEBUG_TRACE,
 				"=>ldap_back_getconn: %s.\n", buf, 0, 0 );
 		}
@@ -895,12 +1127,10 @@ done:;
 
 void
 ldap_back_release_conn_lock(
-	Operation		*op,
-	SlapReply		*rs,
+	ldapinfo_t		*li,
 	ldapconn_t		**lcp,
 	int			dolock )
 {
-	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
 
 	ldapconn_t	*lc = *lcp;
 
@@ -911,7 +1141,7 @@ ldap_back_release_conn_lock(
 	LDAP_BACK_CONN_BINDING_CLEAR( lc );
 	lc->lc_refcnt--;
 	if ( LDAP_BACK_CONN_TAINTED( lc ) ) {
-		ldap_back_freeconn( op, lc, 0 );
+		ldap_back_freeconn( li, lc, 0 );
 		*lcp = NULL;
 	}
 	if ( dolock ) {
@@ -924,7 +1154,7 @@ ldap_back_quarantine(
 	Operation	*op,
 	SlapReply	*rs )
 {
-	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
+	ldapinfo_t		*li = (ldapinfo_t *)op->o_bd->be_private;
 
 	slap_retry_info_t	*ri = &li->li_quarantine;
 
@@ -969,9 +1199,13 @@ ldap_back_quarantine(
 		ri->ri_last = new_last;
 
 	} else if ( li->li_isquarantined != LDAP_BACK_FQ_NO ) {
+		if ( ri->ri_last == slap_get_time() ) {
+			goto done;
+		}
+
 		Debug( LDAP_DEBUG_ANY,
-			"%s: ldap_back_quarantine exit.\n",
-			op->o_log_prefix, ri->ri_idx, ri->ri_count );
+			"%s: ldap_back_quarantine exit (%d) err=%d.\n",
+			op->o_log_prefix, li->li_isquarantined, rs->sr_err );
 
 		if ( li->li_quarantine_f ) {
 			(void)li->li_quarantine_f( li, li->li_quarantine_p );
@@ -986,6 +1220,17 @@ done:;
 	ldap_pvt_thread_mutex_unlock( &li->li_quarantine_mutex );
 }
 
+static int
+ldap_back_dobind_cb(
+	Operation *op,
+	SlapReply *rs
+)
+{
+	ber_tag_t *tptr = op->o_callback->sc_private;
+	op->o_tag = *tptr;
+	return SLAP_CB_CONTINUE;
+}
+
 /*
  * ldap_back_dobind_int
  *
@@ -1010,6 +1255,8 @@ ldap_back_dobind_int(
 			isbound,
 			binding = 0;
 	ber_int_t	msgid;
+	ber_tag_t	o_tag = op->o_tag;
+	slap_callback cb = {0};
 
 	assert( lcp != NULL );
 	assert( retries >= 0 );
@@ -1038,7 +1285,6 @@ retry_lock:;
 		/* check if already bound */
 		rc = isbound = LDAP_BACK_CONN_ISBOUND( lc );
 		if ( isbound ) {
-			lc->lc_binding--;
  			if ( dolock ) {
  				ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
  			}
@@ -1060,16 +1306,6 @@ retry_lock:;
 		}
 	}
 
-	/* wait for pending operations to finish */
-	/* FIXME: may become a bottleneck! */
-	if ( lc->lc_refcnt != lc->lc_binding ) {
- 		if ( dolock ) {
- 			ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
- 		}
-		ldap_pvt_thread_yield();
-		goto retry_lock;
-	}
-
  	if ( dolock ) {
  		ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
  	}
@@ -1092,15 +1328,24 @@ retry_lock:;
 	 * then bind as the asserting identity and explicitly 
 	 * add the proxyAuthz control to every operation with the
 	 * dn bound to the connection as control value.
-	 * This is done also if this is the authrizing backend,
+	 * This is done also if this is the authorizing backend,
 	 * but the "override" flag is given to idassert.
 	 * It allows to use SASL bind and yet proxyAuthz users
 	 */
+	op->o_tag = LDAP_REQ_BIND;
+	cb.sc_next = op->o_callback;
+	cb.sc_private = &o_tag;
+	cb.sc_response = ldap_back_dobind_cb;
+	op->o_callback = &cb;
+
 	if ( LDAP_BACK_CONN_ISIDASSERT( lc ) ) {
 		if ( BER_BVISEMPTY( &binddn ) && BER_BVISEMPTY( &bindcred ) ) {
-			ldap_back_is_proxy_authz( op, rs, sendok, &binddn, &bindcred );
+			/* if we got here, it shouldn't return result */
+			rc = ldap_back_is_proxy_authz( op, rs,
+				LDAP_BACK_DONTSEND, &binddn, &bindcred );
+			assert( rc == 1 );
 		}
-		(void)ldap_back_proxy_authz_bind( lc, op, rs, sendok, &binddn, &bindcred );
+		rc = ldap_back_proxy_authz_bind( lc, op, rs, sendok, &binddn, &bindcred );
 		goto done;
 	}
 
@@ -1128,6 +1373,14 @@ retry_lock:;
 				li->li_acl_authcID.bv_val,
 				li->li_acl_passwd.bv_val,
 				NULL );
+		if ( defaults == NULL ) {
+			rs->sr_err = LDAP_OTHER;
+			LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
+			if ( sendok & LDAP_BACK_SENDERR ) {
+				send_ldap_result( op, rs );
+			}
+			goto done;
+		}
 
 		rs->sr_err = ldap_sasl_interactive_bind_s( lc->lc_ld,
 				li->li_acl_authcDN.bv_val,
@@ -1174,9 +1427,9 @@ retry:;
 				lc->lc_ld = NULL;
 
 				/* lc here must be the regular lc, reset and ready for init */
-				rs->sr_err = ldap_back_prepare_conn( &lc, op, rs, sendok );
+				rs->sr_err = ldap_back_prepare_conn( lc, op, rs, sendok );
 				if ( rs->sr_err != LDAP_SUCCESS ) {
-					lc->lc_binding--;
+					sendok &= ~LDAP_BACK_SENDERR;
 					lc->lc_refcnt = 0;
 				}
 			}
@@ -1191,20 +1444,11 @@ retry:;
 				}
 				goto retry;
 			}
-
-		} else {
-			if ( dolock ) {
-				ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
-			}
-			lc->lc_binding--;
-			if ( dolock ) {
-				ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
-			}
 		}
 
-		/* FIXME: one binding-- too many? */
-		lc->lc_binding--;
-		ldap_back_freeconn( op, lc, dolock );
+		assert( lc->lc_refcnt == 1 );
+		lc->lc_refcnt = 0;
+		ldap_back_freeconn( li, lc, dolock );
 		*lcp = NULL;
 		rs->sr_err = slap_map_api2result( rs );
 
@@ -1215,29 +1459,38 @@ retry:;
 		if ( rs->sr_err != LDAP_SUCCESS &&
 			( sendok & LDAP_BACK_SENDERR ) )
 		{
+			if ( op->o_callback == &cb )
+				op->o_callback = cb.sc_next;
+			op->o_tag = o_tag;
+			rs->sr_text = "Proxy can't contact remote server";
 			send_ldap_result( op, rs );
 		}
 
-		return 0;
+		rc = 0;
+		goto leave;
 	}
 
 	rc = ldap_back_op_result( lc, op, rs, msgid,
-		-1, (sendok|LDAP_BACK_BINDING) );
+		-1, ( sendok | LDAP_BACK_BINDING ) );
 	if ( rc == LDAP_SUCCESS ) {
 		LDAP_BACK_CONN_ISBOUND_SET( lc );
 	}
 
 done:;
-	lc->lc_binding--;
 	LDAP_BACK_CONN_BINDING_CLEAR( lc );
 	rc = LDAP_BACK_CONN_ISBOUND( lc );
 	if ( !rc ) {
-		ldap_back_release_conn_lock( op, rs, lcp, dolock );
+		ldap_back_release_conn_lock( li, lcp, dolock );
 
 	} else if ( LDAP_BACK_SAVECRED( li ) ) {
 		ldap_set_rebind_proc( lc->lc_ld, li->li_rebind_f, lc );
 	}
 
+leave:;
+	if ( op->o_callback == &cb )
+		op->o_callback = cb.sc_next;
+	op->o_tag = o_tag;
+
 	return rc;
 }
 
@@ -1342,7 +1595,7 @@ ldap_back_cancel(
 	}
 
 	if ( LDAP_BACK_IGNORE( li ) ) {
-		return LDAP_SUCCESS;
+		return ldap_pvt_discard( lc->lc_ld, msgid );
 	}
 
 	if ( LDAP_BACK_CANCEL( li ) ) {
@@ -1435,8 +1688,23 @@ retry:;
 				if ( sendok & LDAP_BACK_BINDING ) {
 					ldap_unbind_ext( lc->lc_ld, NULL, NULL );
 					lc->lc_ld = NULL;
+
+					/* let it be used, but taint/delete it so that 
+					 * no-one else can look it up any further */
+					ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+
+#if LDAP_BACK_PRINT_CONNTREE > 0
+					ldap_back_print_conntree( li, ">>> ldap_back_getconn(timeout)" );
+#endif /* LDAP_BACK_PRINT_CONNTREE */
+
+					(void)ldap_back_conn_delete( li, lc );
 					LDAP_BACK_CONN_TAINTED_SET( lc );
 
+#if LDAP_BACK_PRINT_CONNTREE > 0
+					ldap_back_print_conntree( li, "<<< ldap_back_getconn(timeout)" );
+#endif /* LDAP_BACK_PRINT_CONNTREE */
+					ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+
 				} else {
 					(void)ldap_back_cancel( lc, op, rs, msgid, sendok );
 				}
@@ -1472,18 +1740,44 @@ retry:;
 			if ( rc != LDAP_SUCCESS ) {
 				rs->sr_err = rc;
 			}
-			if ( refs != NULL ) {
-				int	i;
-
-				for ( i = 0; refs[ i ] != NULL; i++ )
-					/* count */ ;
-				rs->sr_ref = op->o_tmpalloc( sizeof( struct berval ) * ( i + 1 ),
-					op->o_tmpmemctx );
-				for ( i = 0; refs[ i ] != NULL; i++ ) {
-					ber_str2bv( refs[ i ], 0, 0, &rs->sr_ref[ i ] );
+
+			/* RFC 4511: referrals can only appear
+			 * if result code is LDAP_REFERRAL */
+			if ( refs != NULL
+				&& refs[ 0 ] != NULL
+				&& refs[ 0 ][ 0 ] != '\0' )
+			{
+				if ( rs->sr_err != LDAP_REFERRAL ) {
+					Debug( LDAP_DEBUG_ANY,
+						"%s ldap_back_op_result: "
+						"got referrals with err=%d\n",
+						op->o_log_prefix,
+						rs->sr_err, 0 );
+
+				} else {
+					int	i;
+
+					for ( i = 0; refs[ i ] != NULL; i++ )
+						/* count */ ;
+					rs->sr_ref = op->o_tmpalloc( sizeof( struct berval ) * ( i + 1 ),
+						op->o_tmpmemctx );
+					for ( i = 0; refs[ i ] != NULL; i++ ) {
+						ber_str2bv( refs[ i ], 0, 0, &rs->sr_ref[ i ] );
+					}
+					BER_BVZERO( &rs->sr_ref[ i ] );
 				}
-				BER_BVZERO( &rs->sr_ref[ i ] );
+
+			} else if ( rs->sr_err == LDAP_REFERRAL ) {
+				Debug( LDAP_DEBUG_ANY,
+					"%s ldap_back_op_result: "
+					"got err=%d with null "
+					"or empty referrals\n",
+					op->o_log_prefix,
+					rs->sr_err, 0 );
+
+				rs->sr_err = LDAP_NO_SUCH_OBJECT;
 			}
+
 			if ( ctrls != NULL ) {
 				rs->sr_ctrls = ctrls;
 			}
@@ -1512,6 +1806,7 @@ retry:;
 				ldap_back_quarantine( op, rs );
 			}
 			if ( op->o_conn && ( sendok & LDAP_BACK_SENDERR ) ) {
+				if ( rs->sr_text == NULL ) rs->sr_text = "Proxy operation retry failed";
 				send_ldap_result( op, rs );
 			}
 		}
@@ -1537,12 +1832,14 @@ retry:;
 	rs->sr_text = NULL;
 
 	if ( rs->sr_ref ) {
-		assert( refs != NULL );
-		ber_memvfree( (void **)refs );
 		op->o_tmpfree( rs->sr_ref, op->o_tmpmemctx );
 		rs->sr_ref = NULL;
 	}
 
+	if ( refs ) {
+		ber_memvfree( (void **)refs );
+	}
+
 	if ( ctrls ) {
 		assert( rs->sr_ctrls != NULL );
 		ldap_controls_free( ctrls );
@@ -1556,8 +1853,8 @@ retry:;
 int
 ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
 {
-	int		rc = 0;
 	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
+	int		rc = 0;
 
 	assert( lcp != NULL );
 	assert( *lcp != NULL );
@@ -1565,6 +1862,8 @@ ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_
 	ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
 
 	if ( (*lcp)->lc_refcnt == 1 ) {
+		int binding = LDAP_BACK_CONN_BINDING( *lcp );
+
 		ldap_pvt_thread_mutex_lock( &li->li_uri_mutex );
 		Debug( LDAP_DEBUG_ANY,
 			"%s ldap_back_retry: retrying URI=\"%s\" DN=\"%s\"\n",
@@ -1578,21 +1877,27 @@ ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_
 		LDAP_BACK_CONN_ISBOUND_CLEAR( (*lcp) );
 
 		/* lc here must be the regular lc, reset and ready for init */
-		rc = ldap_back_prepare_conn( lcp, op, rs, sendok );
+		rc = ldap_back_prepare_conn( *lcp, op, rs, sendok );
 		if ( rc != LDAP_SUCCESS ) {
 			/* freeit, because lc_refcnt == 1 */
 			(*lcp)->lc_refcnt = 0;
-			(void)ldap_back_freeconn( op, *lcp, 0 );
+			(void)ldap_back_freeconn( li, *lcp, 0 );
 			*lcp = NULL;
 			rc = 0;
 
+		} else if ( ( sendok & LDAP_BACK_BINDING ) ) {
+			if ( binding ) {
+				LDAP_BACK_CONN_BINDING_SET( *lcp );
+			}
+			rc = 1;
+
 		} else {
 			rc = ldap_back_dobind_int( lcp, op, rs, sendok, 0, 0 );
 			if ( rc == 0 && *lcp != NULL ) {
 				/* freeit, because lc_refcnt == 1 */
 				(*lcp)->lc_refcnt = 0;
 				LDAP_BACK_CONN_TAINTED_SET( *lcp );
-				(void)ldap_back_freeconn( op, *lcp, 0 );
+				(void)ldap_back_freeconn( li, *lcp, 0 );
 				*lcp = NULL;
 			}
 		}
@@ -1603,12 +1908,12 @@ ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_
 			(void *)(*lcp), (*lcp)->lc_refcnt, 0 );
 
 		LDAP_BACK_CONN_TAINTED_SET( *lcp );
-		ldap_back_release_conn_lock( op, rs, lcp, 0 );
+		ldap_back_release_conn_lock( li, lcp, 0 );
 		assert( *lcp == NULL );
 
-		if ( sendok ) {
+		if ( sendok & LDAP_BACK_SENDERR ) {
 			rs->sr_err = LDAP_UNAVAILABLE;
-			rs->sr_text = "unable to retry";
+			rs->sr_text = "Unable to retry";
 			send_ldap_result( op, rs );
 		}
 	}
@@ -1645,6 +1950,7 @@ ldap_back_is_proxy_authz( Operation *op, SlapReply *rs, ldap_back_send_t sendok,
 		rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
 		if ( sendok & LDAP_BACK_SENDERR ) {
 			send_ldap_result( op, rs );
+			dobind = -1;
 		}
 		goto done;
 	}
@@ -1674,11 +1980,15 @@ ldap_back_is_proxy_authz( Operation *op, SlapReply *rs, ldap_back_send_t sendok,
 
 	default:
 		/* NOTE: rootdn can always idassert */
-		if ( BER_BVISNULL( &ndn ) && li->li_idassert_authz == NULL ) {
+		if ( BER_BVISNULL( &ndn )
+			&& li->li_idassert_authz == NULL
+			&& !( li->li_idassert_flags & LDAP_BACK_AUTH_AUTHZ_ALL ) )
+		{
 			if ( li->li_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) {
 				rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
 				if ( sendok & LDAP_BACK_SENDERR ) {
 					send_ldap_result( op, rs );
+					dobind = -1;
 				}
 
 			} else {
@@ -1705,6 +2015,7 @@ ldap_back_is_proxy_authz( Operation *op, SlapReply *rs, ldap_back_send_t sendok,
 				if ( li->li_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) {
 					if ( sendok & LDAP_BACK_SENDERR ) {
 						send_ldap_result( op, rs );
+						dobind = -1;
 					}
 
 				} else {
@@ -1809,6 +2120,14 @@ ldap_back_proxy_authz_bind(
 				li->li_idassert_authcID.bv_val,
 				li->li_idassert_passwd.bv_val,
 				authzID.bv_val );
+		if ( defaults == NULL ) {
+			rs->sr_err = LDAP_OTHER;
+			LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
+			if ( sendok & LDAP_BACK_SENDERR ) {
+				send_ldap_result( op, rs );
+			}
+			goto done;
+		}
 
 		rs->sr_err = ldap_sasl_interactive_bind_s( lc->lc_ld, binddn->bv_val,
 				li->li_idassert_sasl_mech.bv_val, NULL, NULL,
@@ -1847,7 +2166,7 @@ ldap_back_proxy_authz_bind(
 				binddn->bv_val, LDAP_SASL_SIMPLE,
 				bindcred, NULL, NULL, &msgid );
 		rc = ldap_back_op_result( lc, op, rs, msgid,
-			-1, (sendok|LDAP_BACK_BINDING) );
+			-1, ( sendok | LDAP_BACK_BINDING ) );
 		break;
 
 	default:
@@ -1867,13 +2186,17 @@ ldap_back_proxy_authz_bind(
 		LDAP_BACK_CONN_ISBOUND_SET( lc );
 		ber_bvreplace( &lc->lc_bound_ndn, binddn );
 
+		if ( !BER_BVISNULL( &lc->lc_cred ) ) {
+			memset( lc->lc_cred.bv_val, 0,
+					lc->lc_cred.bv_len );
+		}
+
 		if ( LDAP_BACK_SAVECRED( li ) ) {
-			if ( !BER_BVISNULL( &lc->lc_cred ) ) {
-				memset( lc->lc_cred.bv_val, 0,
-						lc->lc_cred.bv_len );
-			}
 			ber_bvreplace( &lc->lc_cred, bindcred );
 			ldap_set_rebind_proc( lc->lc_ld, li->li_rebind_f, lc );
+
+		} else {
+			lc->lc_cred.bv_len = 0;
 		}
 	}
 done:;
@@ -1908,48 +2231,31 @@ done:;
  */
 int
 ldap_back_proxy_authz_ctrl(
+		Operation	*op,
+		SlapReply	*rs,
 		struct berval	*bound_ndn,
 		int		version,
 		slap_idassert_t	*si,
-		Operation	*op,
-		SlapReply	*rs,
-		LDAPControl	***pctrls )
+		LDAPControl	*ctrl )
 {
-	LDAPControl		**ctrls = NULL;
-	int			i = 0;
 	slap_idassert_mode_t	mode;
 	struct berval		assertedID,
 				ndn;
+	int			isroot = 0;
 
-	*pctrls = NULL;
-
-	rs->sr_err = LDAP_SUCCESS;
-
-	/* don't proxyAuthz if protocol is not LDAPv3 */
-	switch ( version ) {
-	case LDAP_VERSION3:
-		break;
-
-	case 0:
-		if ( op->o_protocol == 0 || op->o_protocol == LDAP_VERSION3 ) {
-			break;
-		}
-		/* fall thru */
-
-	default:
-		goto done;
-	}
+	rs->sr_err = SLAP_CB_CONTINUE;
 
 	/* FIXME: SASL/EXTERNAL over ldapi:// doesn't honor the authcID,
 	 * but if it is not set this test fails.  We need a different
 	 * means to detect if idassert is enabled */
 	if ( ( BER_BVISNULL( &si->si_bc.sb_authcId ) || BER_BVISEMPTY( &si->si_bc.sb_authcId ) )
-			&& ( BER_BVISNULL( &si->si_bc.sb_binddn ) || BER_BVISEMPTY( &si->si_bc.sb_binddn ) ) )
+		&& ( BER_BVISNULL( &si->si_bc.sb_binddn ) || BER_BVISEMPTY( &si->si_bc.sb_binddn ) )
+		&& BER_BVISNULL( &si->si_bc.sb_saslmech ) )
 	{
 		goto done;
 	}
 
-	if ( !op->o_conn || op->o_do_not_cache || be_isroot( op ) ) {
+	if ( !op->o_conn || op->o_do_not_cache || ( isroot = be_isroot( op ) ) ) {
 		goto done;
 	}
 
@@ -2001,7 +2307,7 @@ ldap_back_proxy_authz_ctrl(
 			goto done;
 		}
 
-	} else if ( si->si_authz && !be_isroot( op ) ) {
+	} else if ( si->si_authz && !isroot ) {
 		int		rc;
 		struct berval authcDN;
 
@@ -2011,7 +2317,7 @@ ldap_back_proxy_authz_ctrl(
 			authcDN = ndn;
 		}
 		rc = slap_sasl_matches( op, si->si_authz,
-				&authcDN, & authcDN );
+				&authcDN, &authcDN );
 		if ( rc != LDAP_SUCCESS ) {
 			if ( si->si_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) {
 				/* ndn is not authorized
@@ -2052,21 +2358,11 @@ ldap_back_proxy_authz_ctrl(
 	}
 
 	switch ( mode ) {
-	case LDAP_BACK_IDASSERT_SELF:
-		if ( BER_BVISNULL( &ndn ) ) {
-			goto done;
-		}
-		assertedID = ndn;
-		break;
-
 	case LDAP_BACK_IDASSERT_LEGACY:
 		/* original behavior:
 		 * assert the client's identity */
-		if ( BER_BVISNULL( &ndn ) ) {
-			assertedID = slap_empty_bv;
-		} else {
-			assertedID = ndn;
-		}
+	case LDAP_BACK_IDASSERT_SELF:
+		assertedID = ndn;
 		break;
 
 	case LDAP_BACK_IDASSERT_ANONYMOUS:
@@ -2088,6 +2384,7 @@ ldap_back_proxy_authz_ctrl(
 		assert( 0 );
 	}
 
+	/* if we got here, "" is allowed to proxyAuthz */
 	if ( BER_BVISNULL( &assertedID ) ) {
 		assertedID = slap_empty_bv;
 	}
@@ -2097,33 +2394,25 @@ ldap_back_proxy_authz_ctrl(
 		goto done;
 	}
 
-	if ( op->o_ctrls ) {
-		for ( i = 0; op->o_ctrls[ i ]; i++ )
-			/* just count ctrls */ ;
-	}
-
-	ctrls = op->o_tmpalloc( sizeof( LDAPControl * ) * (i + 2) + sizeof( LDAPControl ),
-			op->o_tmpmemctx );
-	ctrls[ 0 ] = (LDAPControl *)&ctrls[ i + 2 ];
-	
-	ctrls[ 0 ]->ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;
-	ctrls[ 0 ]->ldctl_iscritical = 1;
+	ctrl->ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;
 
 	switch ( si->si_mode ) {
 	/* already in u:ID or dn:DN form */
 	case LDAP_BACK_IDASSERT_OTHERID:
 	case LDAP_BACK_IDASSERT_OTHERDN:
-		ber_dupbv_x( &ctrls[ 0 ]->ldctl_value, &assertedID, op->o_tmpmemctx );
+		ber_dupbv_x( &ctrl->ldctl_value, &assertedID, op->o_tmpmemctx );
+		rs->sr_err = LDAP_SUCCESS;
 		break;
 
 	/* needs the dn: prefix */
 	default:
-		ctrls[ 0 ]->ldctl_value.bv_len = assertedID.bv_len + STRLENOF( "dn:" );
-		ctrls[ 0 ]->ldctl_value.bv_val = op->o_tmpalloc( ctrls[ 0 ]->ldctl_value.bv_len + 1,
+		ctrl->ldctl_value.bv_len = assertedID.bv_len + STRLENOF( "dn:" );
+		ctrl->ldctl_value.bv_val = op->o_tmpalloc( ctrl->ldctl_value.bv_len + 1,
 				op->o_tmpmemctx );
-		AC_MEMCPY( ctrls[ 0 ]->ldctl_value.bv_val, "dn:", STRLENOF( "dn:" ) );
-		AC_MEMCPY( &ctrls[ 0 ]->ldctl_value.bv_val[ STRLENOF( "dn:" ) ],
+		AC_MEMCPY( ctrl->ldctl_value.bv_val, "dn:", STRLENOF( "dn:" ) );
+		AC_MEMCPY( &ctrl->ldctl_value.bv_val[ STRLENOF( "dn:" ) ],
 				assertedID.bv_val, assertedID.bv_len + 1 );
+		rs->sr_err = LDAP_SUCCESS;
 		break;
 	}
 
@@ -2132,7 +2421,7 @@ ldap_back_proxy_authz_ctrl(
 	 * this hack provides compatibility with those DSAs that
 	 * implement it this way */
 	if ( si->si_flags & LDAP_BACK_AUTH_OBSOLETE_ENCODING_WORKAROUND ) {
-		struct berval		authzID = ctrls[ 0 ]->ldctl_value;
+		struct berval		authzID = ctrl->ldctl_value;
 		BerElementBuffer	berbuf;
 		BerElement		*ber = (BerElement *)&berbuf;
 		ber_tag_t		tag;
@@ -2146,32 +2435,29 @@ ldap_back_proxy_authz_ctrl(
 			goto free_ber;
 		}
 
-		if ( ber_flatten2( ber, &ctrls[ 0 ]->ldctl_value, 1 ) == -1 ) {
+		if ( ber_flatten2( ber, &ctrl->ldctl_value, 1 ) == -1 ) {
 			rs->sr_err = LDAP_OTHER;
 			goto free_ber;
 		}
 
+		rs->sr_err = LDAP_SUCCESS;
+
 free_ber:;
 		op->o_tmpfree( authzID.bv_val, op->o_tmpmemctx );
 		ber_free_buf( ber );
 
 		if ( rs->sr_err != LDAP_SUCCESS ) {
-			op->o_tmpfree( ctrls, op->o_tmpmemctx );
-			ctrls = NULL;
 			goto done;
 		}
 
 	} else if ( si->si_flags & LDAP_BACK_AUTH_OBSOLETE_PROXY_AUTHZ ) {
-		struct berval		authzID = ctrls[ 0 ]->ldctl_value,
+		struct berval		authzID = ctrl->ldctl_value,
 					tmp;
 		BerElementBuffer	berbuf;
 		BerElement		*ber = (BerElement *)&berbuf;
 		ber_tag_t		tag;
 
 		if ( strncasecmp( authzID.bv_val, "dn:", STRLENOF( "dn:" ) ) != 0 ) {
-			op->o_tmpfree( ctrls[ 0 ]->ldctl_value.bv_val, op->o_tmpmemctx );
-			op->o_tmpfree( ctrls, op->o_tmpmemctx );
-			ctrls = NULL;
 			rs->sr_err = LDAP_PROTOCOL_ERROR;
 			goto done;
 		}
@@ -2191,30 +2477,130 @@ free_ber:;
 			goto free_ber2;
 		}
 
-		if ( ber_flatten2( ber, &ctrls[ 0 ]->ldctl_value, 1 ) == -1 ) {
+		if ( ber_flatten2( ber, &ctrl->ldctl_value, 1 ) == -1 ) {
 			rs->sr_err = LDAP_OTHER;
 			goto free_ber2;
 		}
 
+		ctrl->ldctl_oid = LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ;
+		rs->sr_err = LDAP_SUCCESS;
+
 free_ber2:;
 		op->o_tmpfree( authzID.bv_val, op->o_tmpmemctx );
 		ber_free_buf( ber );
 
 		if ( rs->sr_err != LDAP_SUCCESS ) {
-			op->o_tmpfree( ctrls, op->o_tmpmemctx );
-			ctrls = NULL;
 			goto done;
 		}
+	}
+
+done:;
+
+	return rs->sr_err;
+}
+
+/*
+ * Add controls;
+ *
+ * if any needs to be added, it is prepended to existing ones,
+ * in a newly allocated array.  The companion function
+ * ldap_back_controls_free() must be used to restore the original
+ * status of op->o_ctrls.
+ */
+int
+ldap_back_controls_add(
+		Operation	*op,
+		SlapReply	*rs,
+		ldapconn_t	*lc,
+		LDAPControl	***pctrls )
+{
+	ldapinfo_t	*li = (ldapinfo_t *)op->o_bd->be_private;
+
+	LDAPControl	**ctrls = NULL;
+	/* set to the maximum number of controls this backend can add */
+	LDAPControl	c[ 2 ] = { 0 };
+	int		i = 0, j = 0;
+
+	*pctrls = NULL;
+
+	rs->sr_err = LDAP_SUCCESS;
+
+	/* don't add controls if protocol is not LDAPv3 */
+	switch ( li->li_version ) {
+	case LDAP_VERSION3:
+		break;
+
+	case 0:
+		if ( op->o_protocol == 0 || op->o_protocol == LDAP_VERSION3 ) {
+			break;
+		}
+		/* fall thru */
+
+	default:
+		goto done;
+	}
+
+	/* proxyAuthz for identity assertion */
+	switch ( ldap_back_proxy_authz_ctrl( op, rs, &lc->lc_bound_ndn,
+		li->li_version, &li->li_idassert, &c[ j ] ) )
+	{
+	case SLAP_CB_CONTINUE:
+		break;
+
+	case LDAP_SUCCESS:
+		j++;
+		break;
+
+	default:
+		goto done;
+	}
+
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+	/* session tracking */
+	if ( LDAP_BACK_ST_REQUEST( li ) ) {
+		switch ( slap_ctrl_session_tracking_request_add( op, rs, &c[ j ] ) ) {
+		case SLAP_CB_CONTINUE:
+			break;
+
+		case LDAP_SUCCESS:
+			j++;
+			break;
+
+		default:
+			goto done;
+		}
+	}
+#endif /* SLAP_CONTROL_X_SESSION_TRACKING */
+
+	if ( rs->sr_err == SLAP_CB_CONTINUE ) {
+		rs->sr_err = LDAP_SUCCESS;
+	}
+
+	if ( j == 0 ) {
+		goto done;
+	}
 
-		ctrls[ 0 ]->ldctl_oid = LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ;
+	if ( op->o_ctrls ) {
+		for ( i = 0; op->o_ctrls[ i ]; i++ )
+			/* just count ctrls */ ;
+	}
+
+	ctrls = op->o_tmpalloc( sizeof( LDAPControl * ) * (i + j + 1) + j * sizeof( LDAPControl ),
+			op->o_tmpmemctx );
+	ctrls[ 0 ] = (LDAPControl *)&ctrls[ i + j + 1 ];
+	*ctrls[ 0 ] = c[ 0 ];
+	for ( i = 1; i < j; i++ ) {
+		ctrls[ i ] = &ctrls[ 0 ][ i ];
+		*ctrls[ i ] = c[ i ];
 	}
 
+	i = 0;
 	if ( op->o_ctrls ) {
 		for ( i = 0; op->o_ctrls[ i ]; i++ ) {
-			ctrls[ i + 1 ] = op->o_ctrls[ i ];
+			ctrls[ i + j ] = op->o_ctrls[ i ];
 		}
 	}
-	ctrls[ i + 1 ] = NULL;
+	ctrls[ i + j ] = NULL;
 
 done:;
 	if ( ctrls == NULL ) {
@@ -2227,18 +2613,25 @@ done:;
 }
 
 int
-ldap_back_proxy_authz_ctrl_free( Operation *op, LDAPControl ***pctrls )
+ldap_back_controls_free( Operation *op, SlapReply *rs, LDAPControl ***pctrls )
 {
 	LDAPControl	**ctrls = *pctrls;
 
-	/* we assume that the first control is the proxyAuthz
-	 * added by back-ldap, so it's the only one we explicitly 
-	 * free */
+	/* we assume that the controls added by the proxy come first,
+	 * so as soon as we find op->o_ctrls[ 0 ] we can stop */
 	if ( ctrls && ctrls != op->o_ctrls ) {
+		int	i;
+
 		assert( ctrls[ 0 ] != NULL );
 
-		if ( !BER_BVISNULL( &ctrls[ 0 ]->ldctl_value ) ) {
-			op->o_tmpfree( ctrls[ 0 ]->ldctl_value.bv_val, op->o_tmpmemctx );
+		for ( i = 0; ctrls[ i ] != NULL; i++ ) {
+			if ( op->o_ctrls && ctrls[ i ] == op->o_ctrls[ 0 ] ) {
+				break;
+			}
+
+			if ( !BER_BVISNULL( &ctrls[ i ]->ldctl_value ) ) {
+				op->o_tmpfree( ctrls[ i ]->ldctl_value.bv_val, op->o_tmpmemctx );
+			}
 		}
 
 		op->o_tmpfree( ctrls, op->o_tmpmemctx );