X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fabandon.c;h=670e540f4e8aad829aec860b09e530f0b65d222b;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=10dab8d82cb6c279f5dc46bd4874b23ac4ceddca;hpb=2c0d735aa764df1e531a7e3e4b1cb400129f59f8;p=openldap

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 10dab8d82c..670e540f4e 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -38,11 +38,7 @@ do_abandon( Operation *op, SlapReply *rs )
 	Operation	*o;
 	int		i;
 
-#ifdef NEW_LOGGING
-	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
 
 	/*
 	 * Parse the abandon request.  It looks like this:
@@ -51,15 +47,9 @@ do_abandon( Operation *op, SlapReply *rs )
 	 */
 
 	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", op->o_connid, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
-#endif
-		send_ldap_discon( op, rs,
-			LDAP_PROTOCOL_ERROR, "decoding error" );
-		return -1;
+		send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+		return SLAPD_DISCONNECT;
 	}
 
 	if( get_ctrls( op, rs, 0 ) != LDAP_SUCCESS ) {
@@ -67,22 +57,11 @@ do_abandon( Operation *op, SlapReply *rs )
 		return rs->sr_err;
 	} 
 
-#ifdef NEW_LOGGING
-	LDAP_LOG( OPERATION, ARGS, "do_abandon: conn: %d  id=%ld\n", 
-		op->o_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", 
-			op->o_connid, (long) id, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
-#endif
 		return LDAP_SUCCESS;
 	}
 
@@ -102,7 +81,9 @@ do_abandon( Operation *op, SlapReply *rs )
 
 	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_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;
@@ -110,23 +91,22 @@ do_abandon( Operation *op, SlapReply *rs )
 	}
 
 done:
-
 	op->orn_msgid = id;
+
+	if ( frontendDB->be_abandon ) {
+		op->o_bd = frontendDB;
+		frontendDB->be_abandon( op, rs );
+	}
+
 	for ( i = 0; i < nbackends; i++ ) {
 		op->o_bd = &backends[i];
-
 		if( op->o_bd->be_abandon ) op->o_bd->be_abandon( op, rs );
 	}
 
 	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",
-		op->o_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;
 }
+