X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackglue.c;h=b2665549b07810dccf4057f2985b9b8d419a6c56;hb=27cb98d28d60b1f258ea12852b22bfdfec6380f6;hp=e2afd091567ab08fa75260252ca744500652333b;hpb=7fae7fe15599213581d3e667a8e97a91f95faabb;p=openldap

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index e2afd09156..b2665549b0 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -294,7 +294,6 @@ glue_back_search (
 	BackendDB *be;
 	int i, rc = 0, t2limit = 0, s2limit = 0;
 	long stoptime = 0;
-	struct berval bv;
 	glue_state gs = {0};
 	slap_callback cb;
 
@@ -373,7 +372,7 @@ glue_back_search (
 					s2limit, t2limit, filter, filterstr,
 					attrs, attrsonly);
 
-			} else if (dnIsSuffix(&bv, &be->be_nsuffix[0])) {
+			} else if (dnIsSuffix(ndn, &be->be_nsuffix[0])) {
 				rc = be->be_search (be, conn, op, dn, ndn,
 					scope, deref,
 					s2limit, t2limit, filter, filterstr,
@@ -413,8 +412,15 @@ glue_back_bind (
 	be = glue_back_select (b0, ndn->bv_val);
 
 	if (be && be->be_bind) {
-		conn->c_authz_backend = be;
 		rc = be->be_bind (be, conn, op, dn, ndn, method, cred, edn);
+
+		if( rc == LDAP_SUCCESS ) {
+			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+			if( conn->c_authz_backend == NULL ) {
+				conn->c_authz_backend = be;
+			}
+			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+		}
 	} else {
 		rc = LDAP_UNWILLING_TO_PERFORM;
 		send_ldap_result (conn, op, rc, NULL, "No bind target found",