Skip to content
Snippets Groups Projects
Commit 820bd6af authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

Revert "ITS#6981 don't free entries prematurely" 

This reverts commit 877ebdf5.
parent b4cb585c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 deletions
servers/slapd/result.c
+ 6
− 6
View file @ 820bd6af
...@@ -1414,8 +1414,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) ...@@ -1414,8 +1414,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
Statslog( LDAP_DEBUG_STATS2, "%s ENTRY dn=\"%s\"\n", Statslog( LDAP_DEBUG_STATS2, "%s ENTRY dn=\"%s\"\n",
op->o_log_prefix, rs->sr_entry->e_nname.bv_val, 0, 0, 0 ); op->o_log_prefix, rs->sr_entry->e_nname.bv_val, 0, 0, 0 );
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) rs_flush_entry( op, rs, NULL );
rs_flush_entry( op, rs, NULL );
if ( op->o_res_ber == NULL ) { if ( op->o_res_ber == NULL ) {
bytes = send_ldap_ber( op, ber ); bytes = send_ldap_ber( op, ber );
...@@ -1581,8 +1580,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) ...@@ -1581,8 +1580,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
} }
rc = 0; rc = 0;
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) rs_flush_entry( op, rs, NULL );
rs_flush_entry( op, rs, NULL );
#ifdef LDAP_CONNECTIONLESS #ifdef LDAP_CONNECTIONLESS
if (!op->o_conn || op->o_conn->c_is_udp == 0) { if (!op->o_conn || op->o_conn->c_is_udp == 0) {
...@@ -1618,13 +1616,15 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) ...@@ -1618,13 +1616,15 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
if ( 0 ) {
rel: rel:
rs_flush_entry( op, rs, NULL );
}
if ( op->o_callback ) { if ( op->o_callback ) {
(void)slap_cleanup_play( op, rs ); (void)slap_cleanup_play( op, rs );
} }
rs_flush_entry( op, rs, NULL );
if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) { if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {
rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */ rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */
if ( rs->sr_ctrls ) { if ( rs->sr_ctrls ) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment