Fix rev 1.121/1.122

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 631d3323e5dd9159f12ff683039a70e7ca5bbd52..d9bee99bd8f427f292ca4e00d448133c371d328c 100644 (file)
--- 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;