From: Howard Chu <hyc@openldap.org>
Date: Mon, 11 May 2009 04:29:21 +0000 (+0000)
Subject: ITS#6103 send response even if abandoned
X-Git-Tag: ACLCHECK_0~560
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9fd983a99d350c8560aec9dfd95dafc8b40425bc;p=openldap

ITS#6103 send response even if abandoned
---

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index b3ca5d4832..b7bff32748 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -535,17 +535,18 @@ end_of_loop:;
 
 		break;
 	}
+
+	op->o_callback = cb.sc_next;
 	if ( op->o_abandon ) {
 		rs->sr_err = SLAPD_ABANDON;
 	} else {
-		op->o_callback = cb.sc_next;
 		rs->sr_err = gs.err;
 		rs->sr_matched = gs.matched;
 		rs->sr_ref = gs.refs;
-		rs->sr_ctrls = gs.ctrls;
-
-		send_ldap_result( op, rs );
 	}
+	rs->sr_ctrls = gs.ctrls;
+
+	send_ldap_result( op, rs );
 
 	op->o_bd = b0;
 	op->o_bd->bd_info = bi0;