mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
consistently map operational attrs as well (ITS#5760)
This commit is contained in:
parent
37e8e5a237
commit
203eaa6204
@ -149,6 +149,7 @@ ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
|
|||||||
int remap )
|
int remap )
|
||||||
{
|
{
|
||||||
struct ldapmapping *mapping;
|
struct ldapmapping *mapping;
|
||||||
|
int drop_missing;
|
||||||
|
|
||||||
/* map->map may be NULL when mapping is configured,
|
/* map->map may be NULL when mapping is configured,
|
||||||
* but map->remap can't */
|
* but map->remap can't */
|
||||||
@ -158,7 +159,7 @@ ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
|
|||||||
}
|
}
|
||||||
|
|
||||||
BER_BVZERO( bv );
|
BER_BVZERO( bv );
|
||||||
( void )ldap_back_mapping( map, s, &mapping, remap );
|
drop_missing = ldap_back_mapping( map, s, &mapping, remap );
|
||||||
if ( mapping != NULL ) {
|
if ( mapping != NULL ) {
|
||||||
if ( !BER_BVISNULL( &mapping->dst ) ) {
|
if ( !BER_BVISNULL( &mapping->dst ) ) {
|
||||||
*bv = mapping->dst;
|
*bv = mapping->dst;
|
||||||
@ -166,7 +167,7 @@ ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !map->drop_missing ) {
|
if ( !drop_missing ) {
|
||||||
*bv = *s;
|
*bv = *s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user