mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6752 Handle REP_ENTRY_* flags correctly

Browse Source
This commit is contained in:
Hallvard Furuseth 2010-12-20 10:22:19 +00:00
parent 42a0f5efc2
commit e7df2ef95f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
servers/slapd/overlays/dynlist.c
View File

@ -364,7 +364,7 @@ done:;
if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) { if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
entry_free( rs->sr_entry ); entry_free( rs->sr_entry );
rs->sr_entry = NULL; rs->sr_entry = NULL;
rs->sr_flags ^= REP_ENTRY_MUSTBEFREED; rs->sr_flags &= ~REP_ENTRY_MASK;
} }
return 0; return 0;
@ -379,7 +379,6 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli )
SlapReply r = { REP_SEARCH }; SlapReply r = { REP_SEARCH };
struct berval *url; struct berval *url;
Entry *e; Entry *e;
slap_mask_t e_flags;
int opattrs, int opattrs,
userattrs; userattrs;
dynlist_sc_t dlc = { 0 }; dynlist_sc_t dlc = { 0 };
@ -428,13 +427,11 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli )
o.o_groups = NULL; o.o_groups = NULL;
} }
e_flags = rs->sr_flags; e = rs->sr_entry;
/* ensure e is modifiable, but do not replace
* sr_entry yet since we have pointers into it */
if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE ) ) { if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE ) ) {
e = entry_dup( rs->sr_entry ); e = entry_dup( rs->sr_entry );
e_flags |= ( REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED );
e_flags &= ~REP_ENTRY_MUSTRELEASE;
} else {
e = rs->sr_entry;
} }
dlc.dlc_e = e; dlc.dlc_e = e;
@ -630,8 +627,10 @@ cleanup:;
ldap_free_urldesc( lud ); ldap_free_urldesc( lud );
} }
rs->sr_entry = e; if ( e != rs->sr_entry ) {
rs->sr_flags = e_flags; rs_replace_entry( op, rs, (slap_overinst *)op->o_bd->bd_info, e );
rs->sr_flags |= REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED;
}
return SLAP_CB_CONTINUE; return SLAP_CB_CONTINUE;
} }