X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcancel.c;h=ce0b1fdbc06c5bbf7d9d994b34df8e8d56d25b32;hb=6044e46ec7af21658829edde47c4c9c904093df3;hp=141229b87483be1d596b9d086aefe51242642bff;hpb=0076b40c329936cf8fc788ca109d1d39e5422c5e;p=openldap
diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 141229b874..ce0b1fdbc0 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,6 @@
#include
-#include
#include
#include
#include
@@ -28,13 +27,14 @@
#include
#include
+const struct berval slap_EXOP_CANCEL = BER_BVC(LDAP_EXOP_CANCEL);
+
int cancel_extop( Operation *op, SlapReply *rs )
{
Operation *o;
int rc;
int opid;
BerElement *ber;
- int i;
assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
@@ -56,6 +56,9 @@ int cancel_extop( Operation *op, SlapReply *rs )
(void) ber_free( ber, 1 );
+ Statslog( LDAP_DEBUG_STATS, "%s CANCEL msg=%d\n",
+ op->o_log_prefix, opid, 0, 0, 0 );
+
if ( opid < 0 ) {
rs->sr_text = "message ID invalid";
return LDAP_PROTOCOL_ERROR;
@@ -64,10 +67,10 @@ int cancel_extop( Operation *op, SlapReply *rs )
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 );
+ 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 );
+ slap_op_free( o, NULL );
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
return LDAP_SUCCESS;
}