Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index bd09f3e81106a69531068121c479269dbac3c209..8900f5d152b853d2264f66b857035adc7aee9900 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-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,10 @@ do_abandon( Operation *op, SlapReply *rs )
 {
        ber_int_t       id;
        Operation       *o;
+       const char      *msg;
 
-       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:
@@ -46,7 +48,8 @@ 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;
        }
@@ -55,55 +58,73 @@ do_abandon( Operation *op, SlapReply *rs )
                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;
        }
 
        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.
-        */
 
+       /* Find the operation being abandoned. */
        LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
                if ( o->o_msgid == id ) {
-                       o->o_abandon = 1;
                        break;
                }
        }
 
-       if ( o ) {
-               op->orn_msgid = id;
-
-               op->o_bd = frontendDB;
-               rs->sr_err = frontendDB->be_abandon( op, rs );
-
-       } else {
+       if ( o == NULL ) {
+               msg = "not found";
+               /* The operation is not active. Just discard it if found.  */
                LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
                        if ( o->o_msgid == id ) {
+                               msg = "discarded";
+                               /* FIXME: This traverses c_pending_ops yet again. */
                                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;
                        }
                }
+
+       } else if ( o->o_tag == LDAP_REQ_BIND
+                       || o->o_tag == LDAP_REQ_UNBIND
+                       || o->o_tag == LDAP_REQ_ABANDON ) {
+               msg = "cannot be abandoned";
+
+#if 0 /* Would break o_abandon used as "suppress response" flag, ITS#6138 */
+       } else if ( o->o_abandon ) {
+               msg = "already being abandoned";
+#endif
+
+       } else {
+               msg = "found";
+               /* Set the o_abandon flag in the to-be-abandoned operation.
+                * The backend can periodically check this flag and abort the
+                * operation at a convenient time.  However it should "send"
+                * the response anyway, with result code SLAPD_ABANDON.
+                * The functions in result.c will intercept the message.
+                */
+               o->o_abandon = 1;
+               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",
-               (long) id, o ? "" : "not ", 0 );
+       Debug( LDAP_DEBUG_TRACE, "%s do_abandon: op=%ld %s\n",
+               op->o_log_prefix, (long) id, msg );
        return rs->sr_err;
 }