From d5f221bad6c4ce22b2e77b0805db021477101159 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 13 Jun 2007 16:31:47 +0000 Subject: [PATCH] ITS#5015 allow overlays to inject an abandon (from HEAD r1.289) --- servers/slapd/result.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ) ); -- 2.47.2