fix ITS#3834

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 78fa52904e60cd4eb39e6362cb4eef9b17874d58..95df80c2a59acc708742e04a7f7d029c6d032478 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-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,27 +75,29 @@ 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;
+                       break;
                }
        }
 
-       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;
+       if ( o ) {
+               op->orn_msgid = id;
+
+               op->o_bd = frontendDB;
+               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;
+                       }
                }
        }
 
-done:
-       op->orn_msgid = id;
-
-       op->o_bd = frontendDB;
-       rs->sr_err = frontendDB->be_abandon( op, rs );
-
        ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
        Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
@@ -106,10 +108,7 @@ done:
 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 );
                }