X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcancel.c;h=bc946160105d4381f64564e627b70bcc399f594d;hb=2c4b2b5566e14bbda986be58733d16c94f8b5e35;hp=e1256de909a789cfc43e9371fe3980cb8a6b1bbe;hpb=5d8ece605e8eee1b10cdeec6fd8ed86e36edcd08;p=openldap
diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index e1256de909..bc94616010 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-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -28,13 +28,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 );
@@ -61,6 +62,9 @@ int cancel_extop( Operation *op, SlapReply *rs )
return LDAP_PROTOCOL_ERROR;
}
+ Statslog( LDAP_DEBUG_STATS, "%s CANCEL msg=%d\n",
+ op->o_log_prefix, opid, 0, 0, 0 );
+
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 ) {
@@ -90,8 +94,7 @@ int cancel_extop( Operation *op, SlapReply *rs )
o->o_cancel = SLAP_CANCEL_REQ;
- for ( i = 0; i < nbackends; i++ ) {
- op->o_bd = &backends[i];
+ LDAP_STAILQ_FOREACH( op->o_bd, &backendDB, be_next ) {
if( !op->o_bd->be_cancel ) continue;
op->oq_cancel.rs_msgid = opid;