X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fabandon.c;h=670e540f4e8aad829aec860b09e530f0b65d222b;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=5f2ac082757636ab8c8896da33eeba2fe1ab8976;hpb=8074294f1d5aa59a0cb4a37a97285b5e15bb95a3;p=openldap
diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 5f2ac08275..670e540f4e 100644
--- 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-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2004 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
+ * .
*/
-
-/*
- * 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,23 +32,13 @@
#include "slap.h"
int
-do_abandon(
- Connection *conn,
- Operation *op
-)
+do_abandon( Operation *op, SlapReply *rs )
{
ber_int_t id;
Operation *o;
- int rc;
-#ifdef LDAP_CLIENT_UPDATE
int i;
-#endif
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ENTRY, "conn: %d do_abandon\n", conn->c_connid, 0, 0);
-#else
Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
-#endif
/*
* Parse the abandon request. It looks like this:
@@ -50,83 +47,66 @@ 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 );
-#else
Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
-#endif
- 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 ) {
+ 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 );
-#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",
- conn->c_connid, (long) id, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
-#endif
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 );
+ LDAP_STAILQ_NEXT(o, o_next) = NULL;
+ op->o_conn->c_n_ops_pending--;
slap_op_free( o );
goto done;
}
}
done:
+ op->orn_msgid = id;
+
+ if ( frontendDB->be_abandon ) {
+ op->o_bd = frontendDB;
+ frontendDB->be_abandon( op, rs );
+ }
-#if LDAP_CLIENT_UPDATE
for ( i = 0; i < nbackends; i++ ) {
- if ( strncmp( backends[i].be_type, "bdb", 3 ) ) continue;
- if ( bdb_abandon( &backends[i], conn, id ) == LDAP_SUCCESS ) {
- break;
- }
+ op->o_bd = &backends[i];
+ if( op->o_bd->be_abandon ) op->o_bd->be_abandon( op, rs );
}
-#endif
- 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 " );
-#else
Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
(long) id, o ? "" : "not ", 0 );
-#endif
return LDAP_SUCCESS;
}
+