From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 1 Apr 2006 18:59:26 +0000 (+0000)
Subject: allow overlays to inject an abandon without returning SLAPD_ABANDON
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=44a75a03c0d8bf0190df0820d0a5cb1ea0776813;p=openldap

allow overlays to inject an abandon without returning SLAPD_ABANDON
---

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index f14e17972d..c82f8f651a 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -434,7 +434,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;
 	}
@@ -643,7 +643,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 ) );