#include <ac/string.h>.

[openldap] / servers / slapd / cancel.c

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 4416869ad26f936ab92d9a959e0489ee475cd012..a5ef060282aaa4908855d963256e43ab40125e3e 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -21,67 +21,57 @@
 #include <lber_pvt.h>
 #include <lutil.h>
 
-int cancel_extop(
-       Connection *conn,
-       Operation *op,
-       const char *reqoid,
-       struct berval *reqdata,
-       char **rspoid,
-       struct berval **rspdata,
-       LDAPControl ***rspctrls,
-       const char **text,
-       BerVarray *refs )
+int cancel_extop( Operation *op, SlapReply *rs )
 {
-       Backend *be;
+       Operation *o;
        int rc;
        int found = 0;
        int opid;
        BerElement *ber;
        int i;
 
-       assert( reqoid != NULL );
-       assert( strcmp( LDAP_EXOP_X_CANCEL, reqoid ) == 0 );
+       assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
 
-       if ( reqdata == NULL ) {
-               *text = "no message ID supplied";
+       if ( op->ore_reqdata == NULL ) {
+               rs->sr_text = "no message ID supplied";
                return LDAP_PROTOCOL_ERROR;
        }
 
-       ber = ber_init( reqdata );
+       ber = ber_init( op->ore_reqdata );
        if ( ber == NULL ) {
-               *text = "internal error";
+               rs->sr_text = "internal error";
                return LDAP_OTHER;
        }
 
        if ( ber_scanf( ber, "{i}", &opid ) == LBER_ERROR ) {
-               *text = "message ID parse failed";
+               rs->sr_text = "message ID parse failed";
                return LDAP_PROTOCOL_ERROR;
        }
 
        (void) ber_free( ber, 1 );
 
        if ( opid < 0 ) {
-               *text = "message ID invalid";
+               rs->sr_text = "message ID invalid";
                return LDAP_PROTOCOL_ERROR;
        }
 
-       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-       LDAP_STAILQ_FOREACH( op, &conn->c_pending_ops, o_next ) {
-               if ( op->o_msgid == opid ) {
-                       LDAP_STAILQ_REMOVE( &conn->c_pending_ops, op, slap_op, o_next );
-                       slap_op_free( op );
+       ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+       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 );
+                       slap_op_free( o );
                        found = 1;
                        break;
                }
        }
-       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
        if ( found ) return LDAP_SUCCESS;
 
        found = 0;
-       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-       LDAP_STAILQ_FOREACH( op, &conn->c_ops, o_next ) {
-               if ( op->o_msgid == opid ) {
+       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;
                        break;
                }
@@ -90,34 +80,31 @@ int cancel_extop(
        if ( !found ) {
 #ifdef LDAP_SYNC
                for ( i = 0; i < nbackends; i++ ) {
-                       Backend *be = &backends[i];
-                       if( !be->be_abandon ) continue;
+                       op->o_bd = &backends[i];
+                       if( !op->o_bd->be_cancel ) continue;
 
+                       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
-                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-
-                       if ( be->be_cancel( be, conn, op, opid ) == LDAP_SUCCESS ) {
+                       op->oq_cancel.rs_msgid = opid;
+                       if ( op->o_bd->be_cancel( op, rs ) == LDAP_SUCCESS ) {
                                return LDAP_SUCCESS;
-                       } else {
-                               *text = "message ID not found";
-                               return LDAP_NO_SUCH_OPERATION;
                        }
+                       ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
                }
-#else
-               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-               *text = "message ID not found";
-               return LDAP_NO_SUCH_OPERATION;
 #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( &conn->c_mutex );
-               *text = "message ID already being cancelled";
+               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( &conn->c_mutex );
+       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
        while ( op->o_cancel == SLAP_CANCEL_REQ ) {
                ldap_pvt_thread_yield();