queue implicit binds (ITS#4409)

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 0d312091483d6a302152836eff29a66337a5416c..6bc86c17ae88cb933c7db540faad9f19fd3cc633 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,11 +1,19 @@
 /* abandon.c - decode and handle an ldap abandon operation */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -24,15 +32,10 @@
 #include "slap.h"
 
 int
-do_abandon(
-    Connection *conn,
-    Operation  *op
-)
+do_abandon( Operation *op, SlapReply *rs )
 {
-       ber_int_t               id;
+       ber_int_t       id;
        Operation       *o;
-       Operation       **oo;
-       int rc, notfound;
 
        Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
 
@@ -44,14 +47,16 @@ do_abandon(
 
        if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
-               send_ldap_disconnect( conn, op,
-                       LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+               send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+               return SLAPD_DISCONNECT;
        }
 
-       if( (rc = get_ctrls( conn, op, 0 )) != LDAP_SUCCESS ) {
+       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 rc;
+               return rs->sr_err;
        } 
 
        Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
@@ -62,44 +67,54 @@ do_abandon(
                return LDAP_SUCCESS;
        }
 
-       notfound = 1; /* not found */
-       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
        /*
         * find the operation being abandoned and set the o_abandon
         * flag.  It's up to the backend to periodically check this
         * flag and abort the operation at a convenient time.
         */
 
-       for ( o = conn->c_ops; o != NULL; o = o->o_next ) {
+       LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
                if ( o->o_msgid == id ) {
-                       ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
                        o->o_abandon = 1;
-                       ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
-
-                       notfound = 0;
-                       goto done;
+                       break;
                }
        }
 
-       for ( oo = &conn->c_pending_ops;
-               (*oo != NULL) && ((*oo)->o_msgid != id);
-               oo = &(*oo)->o_next )
-       {
-               /* EMPTY */ ;
-       }
-
-       if( *oo != NULL ) {
-               o = *oo;
-               *oo = (*oo)->o_next;
-               slap_op_free( o );
-               notfound = 0;
+       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:
-       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
        Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
-               id, notfound ? "not " : "", 0 );
+               (long) id, o ? "" : "not ", 0 );
+       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;
 }