From: Howard Chu <hyc@openldap.org>
Date: Tue, 1 Mar 2005 13:55:05 +0000 (+0000)
Subject: ITS#3534, 3546, 3571 revert abandon behavior
X-Git-Tag: OPENLDAP_REL_ENG_2_2_24~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9c4d8bf1ace5e535cd3490c053c9ef1be20f6a9;p=thirdparty%2Fopenldap.git

ITS#3534, 3546, 3571 revert abandon behavior
---

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index b7aaec7492..82bac14dd0 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -772,17 +772,10 @@ static void connection_abandon( Connection *c )
 {
 	/* c_mutex must be locked by caller */
 
-	Operation *o, *next, op = {0};
-	SlapReply rs = {0};
-
-	op.o_conn = c;
-	op.o_connid = c->c_connid;
-	op.o_tag = LDAP_REQ_ABANDON;
-	for ( o = LDAP_STAILQ_FIRST( &c->c_ops ); o; o=next ) {
-		next = LDAP_STAILQ_NEXT( o, o_next );
-		op.orn_msgid = o->o_msgid;
+	Operation *o;
+
+	LDAP_STAILQ_FOREACH( o, &c->c_ops, o_next ) {
 		o->o_abandon = 1;
-		fe_op_abandon( &op, &rs );
 	}
 
 	/* remove pending operations */