From: Howard Chu <hyc@openldap.org>
Date: Sun, 20 Dec 2020 21:31:15 +0000 (+0000)
Subject: [PATCH] ITS#9428 fix cancel exop
X-Git-Tag: archive/raspbian/2.4.47+dfsg-3+rpi1+deb10u6^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc556482b5c17b1f6ed8b5d62e602b4a4b183b7a;p=openldap.git

[PATCH] ITS#9428 fix cancel exop


Gbp-Pq: Name ITS-9428-fix-cancel-exop.patch
---

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index a7bbb535..822c0096 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -64,6 +64,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 ) {