X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcancel.c;h=e1256de909a789cfc43e9371fe3980cb8a6b1bbe;hb=38383fca41d73745ea086c57946dfe2b8c7d7115;hp=2e7ebfea9bb17ba16192acf1fb1726b05a935ac0;hpb=e8c58b4e7f21caa6c0b6006e3528cbad9b8aed45;p=openldap

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 2e7ebfea9b..e1256de909 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -1,8 +1,17 @@
-/* $OpenLDAP$ */
 /* cancel.c - LDAP cancel extended operation */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -16,8 +25,6 @@
 
 #include "slap.h"
 
-#ifdef LDAP_EXOP_X_CANCEL
-
 #include <lber_pvt.h>
 #include <lutil.h>
 
@@ -25,19 +32,18 @@ int cancel_extop( Operation *op, SlapReply *rs )
 {
 	Operation *o;
 	int rc;
-	int found = 0;
 	int opid;
 	BerElement *ber;
 	int i;
 
-	assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->oq_extended.rs_reqoid ) == 0 );
+	assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
 
-	if ( op->oq_extended.rs_reqdata == NULL ) {
+	if ( op->ore_reqdata == NULL ) {
 		rs->sr_text = "no message ID supplied";
 		return LDAP_PROTOCOL_ERROR;
 	}
 
-	ber = ber_init( op->oq_extended.rs_reqdata );
+	ber = ber_init( op->ore_reqdata );
 	if ( ber == NULL ) {
 		rs->sr_text = "internal error";
 		return LDAP_OTHER;
@@ -59,66 +65,56 @@ 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, slap_op, o_next );
+			LDAP_STAILQ_NEXT(o, o_next) = NULL;
+			op->o_conn->c_n_ops_pending--;
 			slap_op_free( o );
-			found = 1;
-			break;
+			ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+			return LDAP_SUCCESS;
 		}
 	}
-	ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-
-	if ( found ) return LDAP_SUCCESS;
 
-	found = 0;
-	ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
 	LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
 		if ( o->o_msgid == opid ) {
-			found = 1;
+			o->o_abandon = 1;
 			break;
 		}
 	}
 
-	if ( !found ) {
-#ifdef LDAP_SYNC
+	ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+
+	if ( o ) {
+		if ( o->o_cancel != SLAP_CANCEL_NONE ) {
+			rs->sr_text = "message ID already being cancelled";
+			return LDAP_PROTOCOL_ERROR;
+		}
+
+		o->o_cancel = SLAP_CANCEL_REQ;
+
 		for ( i = 0; i < nbackends; i++ ) {
 			op->o_bd = &backends[i];
 			if( !op->o_bd->be_cancel ) continue;
 
-			ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-
 			op->oq_cancel.rs_msgid = opid;
 			if ( op->o_bd->be_cancel( op, rs ) == LDAP_SUCCESS ) {
 				return LDAP_SUCCESS;
 			}
-			ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
 		}
-#endif
-		ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-		rs->sr_text = "message ID not found";
-	 	return LDAP_NO_SUCH_OPERATION;
-	}
 
-	if ( op->o_cancel != SLAP_CANCEL_NONE ) {
-		ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-		rs->sr_text = "message ID already being cancelled";
-		return LDAP_PROTOCOL_ERROR;
-	}
-
-	op->o_cancel = SLAP_CANCEL_REQ;
-	ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+		while ( o->o_cancel == SLAP_CANCEL_REQ ) {
+			ldap_pvt_thread_yield();
+		}
 
-	while ( op->o_cancel == SLAP_CANCEL_REQ ) {
-		ldap_pvt_thread_yield();
-	}
+		if ( o->o_cancel == SLAP_CANCEL_ACK ) {
+			rc = LDAP_SUCCESS;
+		} else {
+			rc = o->o_cancel;
+		}
 
-	if ( op->o_cancel == SLAP_CANCEL_ACK ) {
-		rc = LDAP_SUCCESS;
+		o->o_cancel = SLAP_CANCEL_DONE;
 	} else {
-		rc = op->o_cancel;
+		rs->sr_text = "message ID not found";
+	 	rc = LDAP_NO_SUCH_OPERATION;
 	}
 
-	op->o_cancel = SLAP_CANCEL_DONE;
-
 	return rc;
 }
-
-#endif /* LDAP_EXOP_X_CANCEL */