ITS#3549 acknowledge CANCEL requests

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index d59d403e7a09126e192d283251cbe8cc7965e3e6..d56b666d7576c52a6d55cfa9699dbe2a1d609c7a 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1049,7 +1049,10 @@ operations_error:
        }
 
        if ( op->o_cancel == SLAP_CANCEL_REQ ) {
-               op->o_cancel = LDAP_TOO_LATE;
+               if ( rc == SLAPD_ABANDON )
+                       op->o_cancel = SLAP_CANCEL_ACK;
+               else
+                       op->o_cancel = LDAP_TOO_LATE;
        }
        while ( op->o_cancel != SLAP_CANCEL_NONE &&
                op->o_cancel != SLAP_CANCEL_DONE )