From: Howard Chu <hyc@openldap.org>
Date: Sun, 20 Dec 2020 21:31:15 +0000 (+0000)
Subject: ITS#9428 fix cancel exop
X-Git-Tag: OPENLDAP_REL_ENG_2_4_57~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d0e8485f3113505743baabf1167e01e4558ccf5;p=thirdparty%2Fopenldap.git

ITS#9428 fix cancel exop
---

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 2060312900..b972b18fc3 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -65,6 +65,11 @@ int cancel_extop( Operation *op, SlapReply *rs )
 		return LDAP_PROTOCOL_ERROR;
 	}
 
+	if ( opid == op->o_msgid ) {
+		op->o_cancel = SLAP_CANCEL_DONE;
+		return LDAP_SUCCESS;
+	}
+
 	ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
 
 	if ( op->o_abandon ) {