From f502695c813bf207f76042e9f0e277a3513d357e Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 1 Nov 2011 16:14:12 -0700 Subject: [PATCH] Revert "ITS#6981 don't flush entries until after cleanup callbacks" This reverts commit b68fa5ecd73037ebd436a2663003f544d482f71e. --- servers/slapd/result.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/servers/slapd/result.c b/servers/slapd/result.c index c5df7d67b8..1e8d406223 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -1414,6 +1414,8 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) Statslog( LDAP_DEBUG_STATS2, "%s ENTRY dn=\"%s\"\n", op->o_log_prefix, rs->sr_entry->e_nname.bv_val, 0, 0, 0 ); + rs_flush_entry( op, rs, NULL ); + if ( op->o_res_ber == NULL ) { bytes = send_ldap_ber( op, ber ); ber_free_buf( ber ); @@ -1578,6 +1580,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) } rc = 0; + rs_flush_entry( op, rs, NULL ); #ifdef LDAP_CONNECTIONLESS if (!op->o_conn || op->o_conn->c_is_udp == 0) { @@ -1613,13 +1616,15 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 ); + if ( 0 ) { rel: + rs_flush_entry( op, rs, NULL ); + } + if ( op->o_callback ) { (void)slap_cleanup_play( op, rs ); } - rs_flush_entry( op, rs, NULL ); - if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) { rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */ if ( rs->sr_ctrls ) { -- 2.39.5