From: Howard Chu <hyc@openldap.org>
Date: Mon, 18 Dec 2006 22:42:46 +0000 (+0000)
Subject: Fix rev 1.121/1.122
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~339
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8274bc75e0e8678d373cca673826cb48dbb15829;p=openldap

Fix rev 1.121/1.122
---

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 631d3323e5..d9bee99bd8 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -87,6 +87,15 @@ typedef struct glue_state {
 	int nctrls;
 } glue_state;
 
+static int
+glue_op_cleanup( Operation *op, SlapReply *rs )
+{
+	/* This is not a final result */
+	if (rs->sr_type == REP_RESULT )
+		rs->sr_type = REP_GLUE_RESULT;
+	return SLAP_CB_CONTINUE;
+}
+
 static int
 glue_op_response ( Operation *op, SlapReply *rs )
 {
@@ -165,8 +174,6 @@ glue_op_response ( Operation *op, SlapReply *rs )
 			gs->nctrls = j;
 			gs->ctrls = newctrls;
 		}
-		/* This is not a final result */
-		rs->sr_type = REP_GLUE_RESULT;
 	}
 	return 0;
 }
@@ -319,7 +326,7 @@ glue_op_search ( Operation *op, SlapReply *rs )
 	int i;
 	long stoptime = 0, starttime;
 	glue_state gs = {NULL, NULL, NULL, 0, 0, 0, 0};
-	slap_callback cb = { NULL, glue_op_response, NULL, NULL };
+	slap_callback cb = { NULL, glue_op_response, glue_op_cleanup, NULL };
 	int scope0, tlimit0;
 	struct berval dn, ndn, *pdn;