ITS#5015 allow overlays to inject an abandon (from HEAD r1.289)

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index e3e9b03b901da7f2503e2a2a1b67166fa22cff95..16ffad273cbdb785827fd1f8021acabfa8368d0e 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -287,7 +287,7 @@ send_ldap_response(
        int             rc = LDAP_SUCCESS;
        long    bytes;
 
-       if ( rs->sr_err == SLAPD_ABANDON ) {
+       if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) {
                rc = SLAPD_ABANDON;
                goto clean2;
        }
@@ -527,7 +527,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
        rs->sr_type = REP_RESULT;
 
        /* Propagate Abandons so that cleanup callbacks can be processed */
-       if ( rs->sr_err == SLAPD_ABANDON )
+       if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon )
                goto abandon;
 
        assert( !LDAP_API_ERROR( rs->sr_err ) );