/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
{
ber_int_t id;
Operation *o;
- int i;
Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
return SLAPD_DISCONNECT;
}
+ Statslog( LDAP_DEBUG_STATS, "%s ABANDON msg=%ld\n",
+ op->o_log_prefix, (long) id, 0, 0, 0 );
+
if( get_ctrls( op, rs, 0 ) != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "do_abandon: get_ctrls failed\n", 0, 0 ,0 );
return rs->sr_err;
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
if ( o->o_msgid == id ) {
o->o_abandon = 1;
- goto done;
- }
- }
-
- LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
- if ( o->o_msgid == id ) {
- 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 );
- goto done;
+ break;
}
}
-done:
- op->orn_msgid = id;
+ if ( o ) {
+ op->orn_msgid = id;
- if ( frontendDB->be_abandon ) {
op->o_bd = frontendDB;
- frontendDB->be_abandon( op, rs );
- }
-
- for ( i = 0; i < nbackends; i++ ) {
- op->o_bd = &backends[i];
- if( op->o_bd->be_abandon ) op->o_bd->be_abandon( op, rs );
+ rs->sr_err = frontendDB->be_abandon( op, rs );
+
+ } else {
+ LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
+ if ( o->o_msgid == id ) {
+ 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 );
+ break;
+ }
+ }
}
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
(long) id, o ? "" : "not ", 0 );
- return LDAP_SUCCESS;
+ return rs->sr_err;
}
+int
+fe_op_abandon( Operation *op, SlapReply *rs )
+{
+ LDAP_STAILQ_FOREACH( op->o_bd, &backendDB, be_next ) {
+ if ( op->o_bd->be_abandon ) {
+ (void)op->o_bd->be_abandon( op, rs );
+ }
+ }
+
+ return LDAP_SUCCESS;
+}