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

improve previous commit; now attribute values are rewritten either if they were DN-valued before or after being remapped

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-02-22 21:29:42 +00:00
parent ba90bad9c8
commit 4e8256f6ab
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,8 +171,8 @@ rwm_op_add( Operation *op, SlapReply *rs )
}
}
if ( (*ap)->a_desc->ad_type->sat_syntax
== slap_schema.si_syn_distinguishedName )
if ( (*ap)->a_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName
|| ( mapping != NULL && mapping->m_dst_ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) )
{
/*
* FIXME: rewrite could fail; in this case
@ -327,7 +327,8 @@ rwm_op_compare( Operation *op, SlapReply *rs )
ad = mapping->m_dst_ad;
}
if ( op->orc_ava->aa_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName )
if ( op->orc_ava->aa_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName
|| ( mapping != NULL && mapping->m_dst_ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) )
{
struct berval *mapped_valsp[2];
@ -436,11 +437,11 @@ rwm_op_modify( Operation *op, SlapReply *rs )
last--;
for ( j = 0; !BER_BVISNULL( &(*mlp)->sml_values[ j ] ); j++ ) {
struct ldapmapping *mapping = NULL;
struct ldapmapping *oc_mapping = NULL;
( void )rwm_mapping( &rwmap->rwm_oc, &(*mlp)->sml_values[ j ],
&mapping, RWM_MAP );
if ( mapping == NULL ) {
&oc_mapping, RWM_MAP );
if ( oc_mapping == NULL ) {
if ( rwmap->rwm_at.drop_missing ) {
/* FIXME: we allow to remove objectClasses as well;
* if the resulting entry is inconsistent, that's
@ -457,13 +458,13 @@ rwm_op_modify( Operation *op, SlapReply *rs )
} else {
ch_free( (*mlp)->sml_values[ j ].bv_val );
ber_dupbv( &(*mlp)->sml_values[ j ], &mapping->m_dst );
ber_dupbv( &(*mlp)->sml_values[ j ], &oc_mapping->m_dst );
}
}
} else {
if ( (*mlp)->sml_desc->ad_type->sat_syntax ==
slap_schema.si_syn_distinguishedName )
if ( (*mlp)->sml_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName
|| ( mapping != NULL && mapping->m_dst_ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) )
{
#ifdef ENABLE_REWRITE
rc = rwm_dnattr_rewrite( op, rs, "modifyAttrDN",
@ -516,7 +517,6 @@ cleanup_mod:;
free( ml );
}
/* TODO: rewrite attribute types, values of DN-valued attributes ... */
return SLAP_CB_CONTINUE;
}

3
servers/slapd/overlays/rwmmap.c
View File

@ -386,7 +386,8 @@ map_attr_value(
if ( value != NULL ) {
assert( mapped_value != NULL );
if ( ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName )
if ( ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName
|| ( mapping != NULL && mapping->m_dst_ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) )
{
dncookie fdc = *dc;
int rc;