From: Howard Chu <hyc@openldap.org>
Date: Fri, 22 Jan 2016 20:41:48 +0000 (+0000)
Subject: ITS#8354 fix syncprov abandon
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4773850d428d60cf495950e7df996fb998a3800e;p=openldap

ITS#8354 fix syncprov abandon

Check for abandon just before recording psearch
---

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 69be484165..9affd0ee67 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2553,6 +2553,11 @@ syncprov_op_search( Operation *op, SlapReply *rs )
 		sop->s_inuse = 2;
 
 		ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
+		if ( op->o_abandon ) {
+			ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
+			ch_free( sop );
+			return SLAPD_ABANDON;
+		}
 		while ( si->si_active ) {
 			/* Wait for active mods to finish before proceeding, as they
 			 * may already have inspected the si_ops list looking for