upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-03 13:40:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6758 Use rs_*() to manage SlapReply entries.

Browse source 
Some noop changes + fixes entry leaks and REP_ENTRY_MODIFIABLE flag leaks.
This commit is contained in:
Hallvard Furuseth 2010-12-31 17:55:36 +00:00
parent 15aa7c472a
commit f4a3304477
9 changed files with 16 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/slapd-modules/cloak/cloak.c
View file

@ -221,10 +221,8 @@ cloak_search_cb( Operation *op, SlapReply *rs )
/*
* We are now committed to cloak an attribute.
*/
if ( rs->sr_flags & REP_ENTRY_MODIFIABLE )
me = e;
else
me = entry_dup( e );
rs_ensure_entry_modifiable( op, rs, (slap_overinst *) op->o_bd->bd_info );
me = rs->sr_entry;
for ( ci = (cloak_info_t *)sc->sc_private; ci; ci = ci->ci_next ) {
Attribute *a;
@ -251,14 +249,6 @@ cloak_search_cb( Operation *op, SlapReply *rs )
}
if ( me != e ) {
if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED )
entry_free( e );
rs->sr_entry = me;
rs->sr_flags |= REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED;
}
return ( SLAP_CB_CONTINUE );
}

5
contrib/slapd-modules/usn/usn.c
View file

@ -135,10 +135,7 @@ usn_operational(
}
if ( !ap ) {
if ( !rs->sr_flags & REP_ENTRY_MODIFIABLE ) {
rs->sr_entry = entry_dup( rs->sr_entry );
rs->sr_flags |=
REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED;
if ( rs_ensure_entry_modifiable( op,rs, on )) {
a = attr_find( rs->sr_entry->e_attrs,
ad_usnChanged );
}

14
servers/slapd/overlays/collect.c
View file

@ -386,19 +386,7 @@ collect_response( Operation *op, SlapReply *rs )
* don't modify it directly. Make a copy and
* work with that instead.
*/
if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE ) ) {
Entry *e;
e = entry_dup( rs->sr_entry );
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
overlay_entry_release_ov( op, rs->sr_entry, 0, on );
rs->sr_flags &= ~REP_ENTRY_MUSTRELEASE;
} else if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
entry_free( rs->sr_entry );
}
rs->sr_entry = e;
rs->sr_flags |= REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED;
}
rs_ensure_entry_modifiable( op, rs, on );
/* Loop for each attribute in this collectinfo */
for(idx=0; idx<ci->ci_ad_num; idx++) {

6
servers/slapd/overlays/pcache.c
View file

@ -2030,11 +2030,7 @@ fetch_queryId_cb( Operation *op, SlapReply *rs )
}
/* clear entry if required */
if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
entry_free( rs->sr_entry );
rs->sr_entry = NULL;
rs->sr_flags ^= REP_ENTRY_MUSTBEFREED;
}
rs_flush_entry( op, rs, (slap_overinst *) op->o_bd->bd_info );
return rc;
}

12
servers/slapd/overlays/syncprov.c
View file

@ -2740,17 +2740,7 @@ syncprov_operational(
}
if ( !ap ) {
if ( !(rs->sr_flags & REP_ENTRY_MODIFIABLE) ) {
Entry *e = entry_dup( rs->sr_entry );
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
overlay_entry_release_ov( op, rs->sr_entry, 0, on );
rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
} else if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
entry_free( rs->sr_entry );
}
rs->sr_entry = e;
rs->sr_flags |=
REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED;
if ( rs_ensure_entry_modifiable( op, rs, on )) {
a = attr_find( rs->sr_entry->e_attrs,
slap_schema.si_ad_contextCSN );
}

27
servers/slapd/overlays/translucent.c
View file

@ -815,14 +815,7 @@ static int translucent_search_cb(Operation *op, SlapReply *rs) {
if ( tc->step & USE_LIST ) {
re = tavl_delete( &tc->list, le, entry_dn_cmp );
if ( re ) {
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
overlay_entry_release_ov( op, rs->sr_entry, 0, on );
}
if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
rs->sr_flags ^= REP_ENTRY_MUSTBEFREED;
entry_free( rs->sr_entry );
}
rs_flush_entry( op, rs, on );
rc = test_filter( op, re, tc->orig );
if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_flags |= REP_ENTRY_MUSTBEFREED;
@ -855,14 +848,7 @@ static int translucent_search_cb(Operation *op, SlapReply *rs) {
rc = overlay_entry_get_ov(op, &rs->sr_entry->e_nname, NULL, NULL, 0, &le, on);
if ( rc == LDAP_SUCCESS && le ) {
re = entry_dup( rs->sr_entry );
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
overlay_entry_release_ov( op, rs->sr_entry, 0, on );
}
if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
rs->sr_flags ^= REP_ENTRY_MUSTBEFREED;
entry_free( rs->sr_entry );
}
rs_flush_entry( op, rs, on );
} else {
le = NULL;
}
@ -902,14 +888,7 @@ static int translucent_search_cb(Operation *op, SlapReply *rs) {
}
/* Dispose of local entry */
if ( tc->step & LCL_SIDE ) {
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
overlay_entry_release_ov( op, rs->sr_entry, 0, on );
}
if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
rs->sr_flags ^= REP_ENTRY_MUSTBEFREED;
entry_free( rs->sr_entry );
}
rs_flush_entry(op, rs, on);
} else {
overlay_entry_release_ov(op, le, 0, on);
}

15
servers/slapd/overlays/valsort.c
View file

@ -297,20 +297,7 @@ valsort_response( Operation *op, SlapReply *rs )
a = attr_find( rs->sr_entry->e_attrs, vi->vi_ad );
if ( !a ) continue;
if (( rs->sr_flags & ( REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED ) ) !=
( REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED ) )
{
Entry *e;
e = entry_dup( rs->sr_entry );
if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
overlay_entry_release_ov( op, rs->sr_entry, 0, on );
rs->sr_flags &= ~REP_ENTRY_MUSTRELEASE;
} else if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
entry_free( rs->sr_entry );
}
rs->sr_entry = e;
rs->sr_flags |= REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED;
if ( rs_ensure_entry_modifiable( op, rs, on )) {
a = attr_find( rs->sr_entry->e_attrs, vi->vi_ad );
}

11
servers/slapd/result.c
View file

@ -1407,13 +1407,10 @@ error_return:;
* should set it back so that the cleanup functions know
* what they're doing.
*/
if ( op->o_tag == LDAP_REQ_SEARCH && rs->sr_type == REP_SEARCH
&& rs->sr_entry
&& ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) )
{
entry_free( rs->sr_entry );
rs->sr_entry = NULL;
rs->sr_flags &= ~REP_ENTRY_MUSTBEFREED;
if ( op->o_tag == LDAP_REQ_SEARCH && rs->sr_type == REP_SEARCH ) {
rs_flush_entry( op, rs, NULL );
} else {
RS_ASSERT( (rs->sr_flags & REP_ENTRY_MASK) == 0 );
}
if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {

10
servers/slapd/slapi/slapi_pblock.c
View file

@ -1176,13 +1176,8 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
break;
case SLAPI_SEARCH_RESULT_ENTRY:
PBLOCK_ASSERT_OP( pb, 0 );
if ( pb->pb_rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
entry_free( pb->pb_rs->sr_entry );
} else if ( pb->pb_rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
be_entry_release_r( pb->pb_op, pb->pb_rs->sr_entry );
pb->pb_rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
}
pb->pb_rs->sr_entry = (Slapi_Entry *)value;
rs_replace_entry( pb->pb_op, pb->pb_rs, NULL, (Slapi_Entry *)value );
/* TODO: Should REP_ENTRY_MODIFIABLE be set? */
pb->pb_rs->sr_flags |= REP_ENTRY_MUSTBEFREED;
break;
case SLAPI_BIND_RET_SASLCREDS:
@ -1429,4 +1424,3 @@ slapi_int_pblock_get_next( Slapi_PBlock **pb )
}
#endif /* LDAP_SLAPI */