From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 5 Jun 2009 00:22:08 +0000 (+0000)
Subject: ITS#6137
X-Git-Tag: OPENLDAP_REL_ENG_2_4_17~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e4567592f3b6752ec1e39e11cb737f276b273274;p=openldap

ITS#6137
---

diff --git a/CHANGES b/CHANGES
index af091212df..ab1fb801b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.17 Engineering
 	Added slapd schema checking tool (ITS#6150)
 	Added slapd writetimeout keyword (ITS#5836)
 	Fixed slapd assert with closing connections (ITS#6111)
+	Fixed slapd cancel behavior (ITS#6137)
 	Fixed slapd cert validation (ITS#6098)
 	Fixed slapd errno handling (ITS#6037)
 	Fixed slapd global alloc handling (ITS#6054)
diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index ef35046c0a..5e65e090db 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -68,12 +68,14 @@ int cancel_extop( Operation *op, SlapReply *rs )
 
 	LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
 		if ( o->o_msgid == opid ) {
-			LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, Operation, o_next );
-			LDAP_STAILQ_NEXT(o, o_next) = NULL;
-			op->o_conn->c_n_ops_pending--;
-			slap_op_free( o, NULL );
 			ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-			return LDAP_SUCCESS;
+			/* TODO: We could instead remove the cancelled operation
+			 * from c_pending_ops like Abandon does, and send its
+			 * response here.  Not if it is pending because of a
+			 * congested connection though.
+			 */
+			rs->sr_text = "too busy for Cancel, try Abandon instead";
+			return LDAP_CANNOT_CANCEL;
 		}
 	}