upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-29 11:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6758 result.c:Use rs_*(). Frees entries earlier.

Browse source 
For readability, use rs_flush_entry() where slap_send_search_entry() and
slap_send_search_reference() release entries before network operations.

This change also frees entires marked MUSTBEFREED earlier.
This commit is contained in:
Hallvard Furuseth 2010-12-31 18:14:31 +00:00
parent f4a3304477
commit a4c2d54127
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/slapd/result.c
View file

@ -1354,11 +1354,7 @@ 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 );
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
be_entry_release_rw( op, rs->sr_entry, 0 );
rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
rs->sr_entry = NULL;
}
rs_flush_entry( op, rs, NULL );
if ( op->o_res_ber == NULL ) {
bytes = send_ldap_ber( op, ber );
@ -1529,12 +1525,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
}
rc = 0;
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
assert( rs->sr_entry != NULL );
be_entry_release_rw( op, rs->sr_entry, 0 );
rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
rs->sr_entry = NULL;
}
rs_flush_entry( op, rs, NULL );
#ifdef LDAP_CONNECTIONLESS
if (!op->o_conn || op->o_conn->c_is_udp == 0) {