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

take care of DN-valued "operational" (generated) attrs

Browse source
This commit is contained in:
Pierangelo Masarati 2005-01-30 22:00:09 +00:00
parent f1791bc653
commit e96e874a18
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/slapd/overlays/rwm.c
View file

@ -785,7 +785,7 @@ rwm_matched( Operation *op, SlapReply *rs )
}
static int
rwm_attrs( Operation *op, SlapReply *rs, Attribute** a_first )
rwm_attrs( Operation *op, SlapReply *rs, Attribute** a_first, int stripEntryDN )
{
slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
struct ldaprwmap *rwmap =
@ -852,11 +852,13 @@ rwm_attrs( Operation *op, SlapReply *rs, Attribute** a_first )
}
if ( (*ap)->a_desc == slap_schema.si_ad_entryDN ) {
/* will be generated by frontend */
goto cleanup_attr;
}
if ( !isupdate && (*ap)->a_desc->ad_type->sat_no_user_mod
if ( stripEntryDN ) {
/* will be generated by frontend */
goto cleanup_attr;
}
} else if ( !isupdate
&& (*ap)->a_desc->ad_type->sat_no_user_mod
&& (*ap)->a_desc->ad_type != slap_schema.si_at_undefined )
{
goto next_attr;
@ -1029,7 +1031,11 @@ rwm_send_entry( Operation *op, SlapReply *rs )
/* FIXME: the entries are in the remote mapping form;
* so we need to select those attributes we are willing
* to return, and remap them accordingly */
(void)rwm_attrs( op, rs, &e->e_attrs );
(void)rwm_attrs( op, rs, &e->e_attrs, 1 );
if ( rs->sr_operational_attrs ) {
(void)rwm_attrs( op, rs, &rs->sr_operational_attrs, 0 );
}
rs->sr_entry = e;
rs->sr_flags = flags;
@ -1059,7 +1065,7 @@ rwm_operational( Operation *op, SlapReply *rs )
* so we need to select those attributes we are willing
* to return, and remap them accordingly */
if ( rs->sr_operational_attrs ) {
rwm_attrs( op, rs, &rs->sr_operational_attrs );
rwm_attrs( op, rs, &rs->sr_operational_attrs, 1 );
}
return SLAP_CB_CONTINUE;