ITS#2764, #2781 revert backend.c patch, just catch the NULL referral

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 447a4e7f61a777970b5a30f88e91941a0f6797a6..98a6f8c10467425b177ccf1301639cca8fad5225 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,12 +1,19 @@
 /* abandon.c - decode and handle an ldap abandon operation */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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
@@ -25,18 +32,14 @@
 #include "slap.h"
 
 int
-do_abandon(
-    Connection *conn,
-    Operation  *op
-)
+do_abandon( Operation *op, SlapReply *rs )
 {
        ber_int_t       id;
        Operation       *o;
-       int             rc;
        int             i;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, ENTRY, "conn: %d do_abandon\n", conn->c_connid, 0, 0);
+       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
@@ -50,23 +53,23 @@ do_abandon(
        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", conn->c_connid, 0, 0 );
+                       "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_disconnect( conn, op,
+               send_ldap_discon( op, rs,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
                return -1;
        }
 
-       if( (rc = get_ctrls( conn, op, 0 )) != LDAP_SUCCESS ) {
+       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;
        } 
 
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ARGS, "do_abandon: conn: %d  id=%ld\n", 
-               conn->c_connid, (long) id, 0 );
+               op->o_connid, (long) id, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
 #endif
@@ -75,7 +78,7 @@ do_abandon(
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
                        "do_abandon: conn: %d bad msgid %ld\n", 
-                       conn->c_connid, (long) id, 0 );
+                       op->o_connid, (long) id, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
@@ -83,23 +86,23 @@ do_abandon(
                return LDAP_SUCCESS;
        }
 
-       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.
         */
 
-       LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
+       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, &conn->c_pending_ops, o_next ) {
+       LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
                if ( o->o_msgid == id ) {
-                       LDAP_STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
+                       LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, slap_op, o_next );
                        slap_op_free( o );
                        goto done;
                }
@@ -107,18 +110,19 @@ do_abandon(
 
 done:
 
+       op->orn_msgid = id;
        for ( i = 0; i < nbackends; i++ ) {
-               Backend *be = &backends[i];
+               op->o_bd = &backends[i];
 
-               if( be->be_abandon ) be->be_abandon( be, conn, op, id );
+               if( op->o_bd->be_abandon ) op->o_bd->be_abandon( op, rs );
        }
 
-       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+       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",
-               conn->c_connid, (long)id, o ? "" : "not " );
+               op->o_connid, (long)id, o ? "" : "not " );
 #else
        Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
                (long) id, o ? "" : "not ", 0 );