import fix to ITS#4964

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 559bcaaa5177a272dd4c898ba7735afc9b79196f..bd09f3e81106a69531068121c479269dbac3c209 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,13 +36,8 @@ do_abandon( Operation *op, SlapReply *rs )
 {
        ber_int_t       id;
        Operation       *o;
-       int             i;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, ENTRY, "conn: %d do_abandon\n", op->o_connid, 0, 0);
-#else
        Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
-#endif
 
        /*
         * Parse the abandon request.  It looks like this:
@@ -51,37 +46,24 @@ do_abandon( Operation *op, SlapReply *rs )
         */
 
        if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "conn: %d do_abandon: ber_scanf failed\n", op->o_connid, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
-#endif
                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 );
                return rs->sr_err;
        } 
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, ARGS, "do_abandon: conn: %d  id=%ld\n", 
-               op->o_connid, (long) id, 0 );
-#else
        Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
-#endif
 
        if( id <= 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "do_abandon: conn: %d bad msgid %ld\n", 
-                       op->o_connid, (long) id, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
-#endif
                return LDAP_SUCCESS;
        }
 
@@ -95,44 +77,44 @@ do_abandon( Operation *op, SlapReply *rs )
        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, slap_op, 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 );
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, ENTRY, 
-               "do_abandon: conn: %d op=%ld %sfound\n",
-               op->o_connid, (long)id, o ? "" : "not " );
-#else
        Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
                (long) id, o ? "" : "not ", 0 );
-#endif
-       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;
+}