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

cleanup: Rename rs_ensure_entry_modifiable().

Browse source 
The name rs_entry2modifiable() is more reasonably sized.
For now, leave behind a macro rs_ensure_entry_modifiable in proto-slap.h.
This commit is contained in:
Hallvard Furuseth 2011-01-28 16:33:55 +00:00
parent 36563721bc
commit 42cb7f06f1
8 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -220,7 +220,7 @@ cloak_search_response_cb( Operation *op, SlapReply *rs )
/*
* We are now committed to cloak an attribute.
*/
rs_ensure_entry_modifiable( op, rs, (slap_overinst *) op->o_bd->bd_info );
rs_entry2modifiable( 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 ) {

2
contrib/slapd-modules/dupent/dupent.c
View file

@ -403,7 +403,7 @@ dupent_response_entry( Operation *op, SlapReply *rs )
return SLAP_CB_CONTINUE;
}
rs_ensure_entry_modifiable( op, rs, dc->dc_on );
rs_entry2modifiable( op, rs, dc->dc_on );
rs->sr_flags &= ~(REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED);
e = rs->sr_entry;

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

@ -135,7 +135,7 @@ usn_operational(
}
if ( !ap ) {
if ( rs_ensure_entry_modifiable( op,rs, on )) {
if ( rs_entry2modifiable( op,rs, on )) {
a = attr_find( rs->sr_entry->e_attrs,
ad_usnChanged );
}

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

@ -386,7 +386,7 @@ collect_response( Operation *op, SlapReply *rs )
* don't modify it directly. Make a copy and
* work with that instead.
*/
rs_ensure_entry_modifiable( op, rs, on );
rs_entry2modifiable( op, rs, on );
/* Loop for each attribute in this collectinfo */
for(idx=0; idx<ci->ci_ad_num; idx++) {

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

@ -2762,7 +2762,7 @@ syncprov_operational(
}
if ( !ap ) {
if ( rs_ensure_entry_modifiable( op, rs, on )) {
if ( rs_entry2modifiable( op, rs, on )) {
a = attr_find( rs->sr_entry->e_attrs,
slap_schema.si_ad_contextCSN );
}

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

@ -297,7 +297,7 @@ valsort_response( Operation *op, SlapReply *rs )
a = attr_find( rs->sr_entry->e_attrs, vi->vi_ad );
if ( !a ) continue;
if ( rs_ensure_entry_modifiable( op, rs, on )) {
if ( rs_entry2modifiable( op, rs, on )) {
a = attr_find( rs->sr_entry->e_attrs, vi->vi_ad );
}

3
servers/slapd/proto-slap.h
View file

@ -1578,8 +1578,9 @@ LDAP_SLAPD_F (void) rs_flush_entry LDAP_P(( Operation *op,
SlapReply *rs, slap_overinst *on ));
LDAP_SLAPD_F (void) rs_replace_entry LDAP_P(( Operation *op,
SlapReply *rs, slap_overinst *on, Entry *e ));
LDAP_SLAPD_F (int) rs_ensure_entry_modifiable LDAP_P(( Operation *op,
LDAP_SLAPD_F (int) rs_entry2modifiable LDAP_P(( Operation *op,
SlapReply *rs, slap_overinst *on ));
#define rs_ensure_entry_modifiable rs_entry2modifiable /* older name */
LDAP_SLAPD_F (void) slap_send_ldap_result LDAP_P(( Operation *op, SlapReply *rs ));
LDAP_SLAPD_F (void) send_ldap_sasl LDAP_P(( Operation *op, SlapReply *rs ));
LDAP_SLAPD_F (void) send_ldap_disconnect LDAP_P(( Operation *op, SlapReply *rs ));

2
servers/slapd/result.c
View file

@ -268,7 +268,7 @@ rs_replace_entry( Operation *op, SlapReply *rs, slap_overinst *on, Entry *e )
* Return nonzero if rs->sr_entry was replaced.
*/
int
rs_ensure_entry_modifiable( Operation *op, SlapReply *rs, slap_overinst *on )
rs_entry2modifiable( Operation *op, SlapReply *rs, slap_overinst *on )
{
if ( rs->sr_flags & REP_ENTRY_MODIFIABLE ) {
rs_assert_ok( rs );