X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fbackglue.c;h=b2665549b07810dccf4057f2985b9b8d419a6c56;hb=6e9c21cff8fc740dc6ed21c6f64d9a8899a33401;hp=f7f68ffeec84014f12eb595fe66d20e11f2c4589;hpb=55501e886f54d857db7a8e7b95e8a0310596188b;p=openldap

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index f7f68ffeec..b2665549b0 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -36,7 +36,7 @@
 
 typedef struct gluenode {
 	BackendDB *be;
-	char *pdn;
+	struct berval pdn;
 } gluenode;
 
 typedef struct glueinfo {
@@ -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;
 		}
 	}
@@ -97,7 +97,7 @@ glue_back_close (
 )
 {
 	static int glueClosed = 0;
-	int rc;
+	int rc = 0;
 
 	if (glueClosed) return 0;
 
@@ -169,7 +169,8 @@ typedef struct glue_state {
 	int matchlen;
 	char *matched;
 	int nrefs;
-	BVarray refs;
+	BerVarray refs;
+	slap_callback *prevcb;
 } glue_state;
 
 static void
@@ -181,14 +182,14 @@ glue_back_response (
 	ber_int_t err,
 	const char *matched,
 	const char *text,
-	BVarray ref,
+	BerVarray ref,
 	const char *resoid,
 	struct berval *resdata,
 	struct berval *sasldata,
 	LDAPControl **ctrls
 )
 {
-	glue_state *gs = op->o_glue;
+	glue_state *gs = op->o_callback->sc_private;
 
 	if (err == LDAP_SUCCESS || gs->err != LDAP_SUCCESS)
 		gs->err = err;
@@ -208,7 +209,7 @@ glue_back_response (
 	}
 	if (ref) {
 		int i, j, k;
-		BVarray new;
+		BerVarray new;
 
 		for (i=0; ref[i].bv_val; i++);
 
@@ -235,18 +236,43 @@ glue_back_sresult (
 	ber_int_t err,
 	const char *matched,
 	const char *text,
-	BVarray refs,
+	BerVarray refs,
 	LDAPControl **ctrls,
 	int nentries
 )
 {
-	glue_state *gs = op->o_glue;
+	glue_state *gs = op->o_callback->sc_private;
 
 	gs->nentries += nentries;
 	glue_back_response (c, op, 0, 0, err, matched, text, refs,
 			    NULL, NULL, NULL, ctrls);
 }
 
+static int
+glue_back_sendentry (
+	BackendDB *be,
+	Connection *c,
+	Operation *op,
+	Entry *e,
+	AttributeName *an,
+	int ao,
+	LDAPControl **ctrls
+)
+{
+	slap_callback *tmp = op->o_callback;
+	glue_state *gs = tmp->sc_private;
+	int rc;
+
+	op->o_callback = gs->prevcb;
+	if (op->o_callback && op->o_callback->sc_sendentry) {
+		rc = op->o_callback->sc_sendentry(be, c, op, e, an, ao, ctrls);
+	} else {
+		rc = send_search_entry(be, c, op, e, an, ao, ctrls);
+	}
+	op->o_callback = tmp;
+	return rc;
+}
+
 static int
 glue_back_search (
 	BackendDB *b0,
@@ -266,11 +292,17 @@ glue_back_search (
 {
 	glueinfo *gi = (glueinfo *)b0->be_private;
 	BackendDB *be;
-	int i, rc, t2limit = 0, s2limit = 0;
+	int i, rc = 0, t2limit = 0, s2limit = 0;
 	long stoptime = 0;
 	glue_state gs = {0};
-	struct berval bv;
+	slap_callback cb;
 
+	cb.sc_response = glue_back_response;
+	cb.sc_sresult = glue_back_sresult;
+	cb.sc_sendentry = glue_back_sendentry;
+	cb.sc_private = &gs;
+
+	gs.prevcb = op->o_callback;
 
 	if (tlimit) {
 		stoptime = slap_get_time () + tlimit;
@@ -293,9 +325,8 @@ glue_back_search (
 
 	case LDAP_SCOPE_ONELEVEL:
 	case LDAP_SCOPE_SUBTREE:
-		op->o_glue = &gs;
-		op->o_sresult = glue_back_sresult;
-		op->o_response = glue_back_response;
+		op->o_callback = &cb;
+		rc = gs.err = LDAP_UNWILLING_TO_PERFORM;
 
 		/*
 		 * Execute in reverse order, most general first 
@@ -305,42 +336,43 @@ glue_back_search (
 				continue;
 			if (tlimit) {
 				t2limit = stoptime - slap_get_time ();
-				if (t2limit <= 0)
+				if (t2limit <= 0) {
+					rc = gs.err = LDAP_TIMELIMIT_EXCEEDED;
 					break;
+				}
 			}
 			if (slimit) {
 				s2limit = slimit - gs.nentries;
-				if (s2limit <= 0)
+				if (s2limit <= 0) {
+					rc = gs.err = LDAP_SIZELIMIT_EXCEEDED;
 					break;
+				}
 			}
+			rc = 0;
 			/*
 			 * check for abandon 
 			 */
-			ldap_pvt_thread_mutex_lock (&op->o_abandonmutex);
-			rc = op->o_abandon;
-			ldap_pvt_thread_mutex_unlock (&op->o_abandonmutex);
-			if (rc) {
-				rc = 0;
+			if (op->o_abandon) {
 				goto done;
 			}
 			be = gi->n[i].be;
 			if (scope == LDAP_SCOPE_ONELEVEL && 
-				!strcmp (gi->n[i].pdn, ndn->bv_val)) {
+				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,
@@ -349,9 +381,7 @@ glue_back_search (
 		}
 		break;
 	}
-	op->o_sresult = NULL;
-	op->o_response = NULL;
-	op->o_glue = NULL;
+	op->o_callback = gs.prevcb;
 
 	send_search_result (conn, op, gs.err, gs.matched, NULL,
 		gs.refs, NULL, gs.nentries);
@@ -360,7 +390,7 @@ done:
 	if (gs.matched)
 		free (gs.matched);
 	if (gs.refs)
-		bvarray_free(gs.refs);
+		ber_bvarray_free(gs.refs);
 	return rc;
 }
 
@@ -382,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",
@@ -575,7 +612,7 @@ glue_back_attribute (
 	Entry *target,
 	struct berval *ndn,
 	AttributeDescription *ad,
-	BVarray *vals
+	BerVarray *vals
 )
 {
 	BackendDB *be;
@@ -717,7 +754,8 @@ glue_tool_entry_get (
 static ID
 glue_tool_entry_put (
 	BackendDB *b0,
-	Entry *e
+	Entry *e,
+	struct berval *text
 )
 {
 	BackendDB *be;
@@ -742,7 +780,7 @@ glue_tool_entry_put (
 			return NOID;
 	}
 	glueBack = be;
-	return be->be_entry_put (be, e);
+	return be->be_entry_put (be, e, text);
 }
 
 static int
@@ -766,7 +804,7 @@ glue_tool_sync (
 	int i;
 
 	/* just sync everyone */
-	for (i = 0; b0->be_nsuffix[i]; i++)
+	for (i = 0; i<gi->nodes; i++)
 		if (gi->n[i].be->be_sync)
 			gi->n[i].be->be_sync (gi->n[i].be);
 	return 0;
@@ -778,7 +816,7 @@ glue_sub_init( )
 	int i, j;
 	int cont = num_subordinates;
 	BackendDB *b1, *be;
-	BackendInfo *bi;
+	BackendInfo *bi = NULL;
 	glueinfo *gi;
 
 	/* While there are subordinate backends, search backwards through the
@@ -801,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--;
@@ -858,8 +896,7 @@ glue_sub_init( )
 					gi->nodes * sizeof(gluenode));
 			}
 			gi->n[gi->nodes].be = be;
-			gi->n[gi->nodes].pdn = dn_parent(NULL,
-				be->be_nsuffix[0]->bv_val);
+			dnParent( &be->be_nsuffix[0], &gi->n[gi->nodes].pdn ); 
 			gi->nodes++;
 		}
 		if (gi) {
@@ -867,8 +904,7 @@ glue_sub_init( )
 			gi = (glueinfo *)ch_realloc(gi,
 				sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
 			gi->n[gi->nodes].be = gi->be;
-			gi->n[gi->nodes].pdn = dn_parent(NULL,
-				b1->be_nsuffix[0]->bv_val);
+			dnParent( &b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
 			gi->nodes++;
 			b1->be_private = gi;
 			b1->bd_info = bi;