From: Howard Chu <hyc@openldap.org>
Date: Tue, 27 Jul 2021 17:02:20 +0000 (+0100)
Subject: ITS#6138 don't allow redundant abandon/cancel ops
X-Git-Tag: OPENLDAP_REL_ENG_2_6_0~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3bd4aa76dbc449bf61776d173c36e8205ab1161;p=thirdparty%2Fopenldap.git

ITS#6138 don't allow redundant abandon/cancel ops
---

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 32e6cf4ca8..f5985d5fe9 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -102,10 +102,8 @@ do_abandon( Operation *op, SlapReply *rs )
 			|| o->o_tag == LDAP_REQ_ABANDON ) {
 		msg = "cannot be abandoned";
 
-#if 0 /* Would break o_abandon used as "suppress response" flag, ITS#6138 */
 	} else if ( o->o_abandon ) {
 		msg = "already being abandoned";
-#endif
 
 	} else {
 		msg = "found";
diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 672fcd2459..5dae4398a8 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -113,13 +113,8 @@ int cancel_extop( Operation *op, SlapReply *rs )
 		rc = LDAP_OPERATIONS_ERROR;
 		rs->sr_text = "message ID already being cancelled";
 
-#if 0
 	} else if ( o->o_abandon ) {
-		/* TODO: Would this break something when
-		 * o_abandon="suppress response"? (ITS#6138)
-		 */
 		rc = LDAP_TOO_LATE;
-#endif
 
 	} else {
 		rc = LDAP_SUCCESS;