Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index efc3ba7c8e88c9ad69b7f480b30c484ef87d3973..9236b9043e077090062ab2d967a9cff3ebf0d36b 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * 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
@@ -36,9 +36,9 @@ do_abandon( Operation *op, SlapReply *rs )
 {
        ber_int_t       id;
        Operation       *o;
-       int             i;
 
-       Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "%s do_abandon\n",
+               op->o_log_prefix, 0, 0 );
 
        /*
         * Parse the abandon request.  It looks like this:
@@ -47,21 +47,27 @@ do_abandon( Operation *op, SlapReply *rs )
         */
 
        if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_abandon: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                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 );
+               Debug( LDAP_DEBUG_ANY, "%s do_abandon: get_ctrls failed\n",
+                       op->o_log_prefix, 0, 0 );
                return rs->sr_err;
        } 
 
-       Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
+       Debug( LDAP_DEBUG_ARGS, "%s do_abandon: id=%ld\n",
+               op->o_log_prefix, (long) id, 0 );
 
        if( id <= 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_abandon: bad msgid %ld\n",
+                       op->o_log_prefix, (long) id, 0 );
                return LDAP_SUCCESS;
        }
 
@@ -89,10 +95,10 @@ do_abandon( Operation *op, SlapReply *rs )
                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 );
+                                       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 );
                                break;
                        }
                }
@@ -100,18 +106,16 @@ do_abandon( Operation *op, SlapReply *rs )
 
        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 );
+       Debug( LDAP_DEBUG_TRACE, "%s do_abandon: op=%ld %sfound\n",
+               op->o_log_prefix,
+               (long) id, o ? "" : "not " );
        return rs->sr_err;
 }
 
 int
 fe_op_abandon( Operation *op, SlapReply *rs )
 {
-       int i;
-
-       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_abandon ) {
                        (void)op->o_bd->be_abandon( op, rs );
                }