ITS#9051 Do not remove callback on intermediate responses

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 2ef09ab5dbbe91135f9a68d89d1689182a0cf5e1..128f8193c29cb8b4da544c4ac261bcd522bcef55 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1492,7 +1492,9 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
        Operation op2 = {0};
        SlapReply rs2 = {REP_RESULT};
 
-       {
+       /* ITS#9051 Make sure we only remove the callback on a final response */
+       if ( rs->sr_type == REP_RESULT || rs->sr_type == REP_EXTENDED ||
+                       rs->sr_type == REP_SASL ) {
                slap_callback *sc = op->o_callback;
                op->o_callback = sc->sc_next;
                op->o_tmpfree(sc, op->o_tmpmemctx );