ITS#3534, 3546, 3571 revert abandon behavior

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index b7aaec749282cc2cb54c611f12f3a5297561b2a6..82bac14dd018c6e34a476c9fb2226c9b8bddbd8e 100644 (file)
--- 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 */