X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconnection.c;h=d59d403e7a09126e192d283251cbe8cc7965e3e6;hb=d520cd607d452fe4809d86f37b299ee7665d0f12;hp=674b04de85a313ebc5c80177c287c3a218f6f697;hpb=b6fbfe8540ebb48f89bf6484a61ce63e752be174;p=openldap

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 674b04de85..d59d403e7a 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1061,27 +1061,11 @@ operations_error:
 
 	ber_set_option( op->o_ber, LBER_OPT_BER_MEMCTX, &memctx_null );
 
-#if 0	/* DELETE ME */
-	if ( op->o_cancel != SLAP_CANCEL_ACK &&
-		( op->o_sync_mode & SLAP_SYNC_PERSIST ) )
-	{
-		slap_sl_mem_detach( ctx, memctx );
-	} else if ( op->o_sync_slog_size != -1 ) {
-		slap_sl_mem_detach( ctx, memctx );
-		LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
-		LDAP_STAILQ_NEXT(op, o_next) = NULL;
-		conn->c_n_ops_executing--;
-		conn->c_n_ops_completed++;
-
-	} else
-#endif
-	{
-		LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
-		LDAP_STAILQ_NEXT(op, o_next) = NULL;
-		slap_op_free( op );
-		conn->c_n_ops_executing--;
-		conn->c_n_ops_completed++;
-	}
+	LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
+	LDAP_STAILQ_NEXT(op, o_next) = NULL;
+	slap_op_free( op );
+	conn->c_n_ops_executing--;
+	conn->c_n_ops_completed++;
 
 	switch( tag ) {
 	case LBER_ERROR: