ITS#6981 don't free entries prematurely

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 1e8d40622382ff2b8eb75f39e1a74b7039bd5725..8b173d452402891a027225b07cd78f53e2633fd6 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -1414,7 +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 ( rs->sr_flags & REP_ENTRY_MUSTRELEASE )
+               rs_flush_entry( op, rs, NULL );
 
        if ( op->o_res_ber == NULL ) {
                bytes = send_ldap_ber( op, ber );
@@ -1580,7 +1581,8 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
        }
 
        rc = 0;
-       rs_flush_entry( op, rs, NULL );
+       if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE )
+               rs_flush_entry( op, rs, NULL );
 
 #ifdef LDAP_CONNECTIONLESS
        if (!op->o_conn || op->o_conn->c_is_udp == 0) {
@@ -1616,15 +1618,13 @@ 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 ) {