From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 14 Feb 2009 13:58:09 +0000 (+0000)
Subject: consistently map operational attrs as well (ITS#5760)
X-Git-Tag: ACLCHECK_0~826
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=203eaa6204ef7d0f8d6bfd3b4881de1f3673e611;p=openldap

consistently map operational attrs as well (ITS#5760)
---

diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
index 90ee782322..9044c1ffc7 100644
--- a/servers/slapd/back-meta/map.c
+++ b/servers/slapd/back-meta/map.c
@@ -149,6 +149,7 @@ ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
 	int remap )
 {
 	struct ldapmapping *mapping;
+	int drop_missing;
 
 	/* map->map may be NULL when mapping is configured,
 	 * but map->remap can't */
@@ -158,7 +159,7 @@ ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *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 ( !BER_BVISNULL( &mapping->dst ) ) {
 			*bv = mapping->dst;
@@ -166,7 +167,7 @@ ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
 		return;
 	}
 
-	if ( !map->drop_missing ) {
+	if ( !drop_missing ) {
 		*bv = *s;
 	}
 }