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

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 0eccc8b8ac..b2665549b0 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -63,7 +63,7 @@ glue_back_select (
 	bv.bv_val = (char *) dn;
 
 	for (i = 0; i<gi->nodes; i++) {
-		if (dnIsSuffix(&bv, gi->n[i].be->be_nsuffix[0])) {
+		if (dnIsSuffix(&bv, &gi->n[i].be->be_nsuffix[0])) {
 			return gi->n[i].be;
 		}
 	}
@@ -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;
 
@@ -360,20 +359,20 @@ glue_back_search (
 			if (scope == LDAP_SCOPE_ONELEVEL && 
 				dn_match(&gi->n[i].pdn, ndn)) {
 				rc = be->be_search (be, conn, op,
-					be->be_suffix[0], be->be_nsuffix[0],
+					&be->be_suffix[0], &be->be_nsuffix[0],
 					LDAP_SCOPE_BASE, deref,
 					s2limit, t2limit, filter, filterstr,
 					attrs, attrsonly);
 
 			} else if (scope == LDAP_SCOPE_SUBTREE &&
-				dnIsSuffix(be->be_nsuffix[0], ndn)) {
+				dnIsSuffix(&be->be_nsuffix[0], ndn)) {
 				rc = be->be_search (be, conn, op,
-					be->be_suffix[0], be->be_nsuffix[0],
+					&be->be_suffix[0], &be->be_nsuffix[0],
 					scope, deref,
 					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",
@@ -833,7 +839,7 @@ glue_sub_init( )
 			if (be->be_flags & SLAP_BFLAG_GLUE_LINKED) {
 				continue;
 			}
-			if (!dnIsSuffix(be->be_nsuffix[0], b1->be_nsuffix[0])) {
+			if (!dnIsSuffix(&be->be_nsuffix[0], &b1->be_nsuffix[0])) {
 				continue;
 			}
 			cont--;
@@ -890,7 +896,7 @@ glue_sub_init( )
 					gi->nodes * sizeof(gluenode));
 			}
 			gi->n[gi->nodes].be = be;
-			dnParent( be->be_nsuffix[0], &gi->n[gi->nodes].pdn ); 
+			dnParent( &be->be_nsuffix[0], &gi->n[gi->nodes].pdn ); 
 			gi->nodes++;
 		}
 		if (gi) {
@@ -898,7 +904,7 @@ glue_sub_init( )
 			gi = (glueinfo *)ch_realloc(gi,
 				sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
 			gi->n[gi->nodes].be = gi->be;
-			dnParent( b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
+			dnParent( &b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
 			gi->nodes++;
 			b1->be_private = gi;
 			b1->bd_info = bi;