From: Ralf Haferkamp <ralf@openldap.org>
Date: Wed, 13 Jun 2007 16:31:47 +0000 (+0000)
Subject: ITS#5015 allow overlays to inject an abandon (from HEAD r1.289)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5f221bad6c4ce22b2e77b0805db021477101159;p=thirdparty%2Fopenldap.git

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 e3e9b03b90..16ffad273c 100644
--- 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 ) );