NVALUES: fix a couple of value_find_ex() calls

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 592eb0f21e32ec53081baac8498e9f59c9c1a1fd..9f7be5ef59408a6e4802c5047251bc588d55da37 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -904,8 +904,15 @@ dn_match_cleanup:;
                                at = attrs_find( at->a_next, b->a_dn_at ) )
                        {
                                if( value_find_ex( b->a_dn_at,
+#ifdef SLAP_NVALUES
+                                       SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
+                                               SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+                                       at->a_nvals ? at->a_nvals : at->a_vals,
+#else
                                        SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-                                       at->a_vals, &bv ) == 0 )
+                                       at->a_vals,
+#endif
+                                       &bv ) == 0 )
                                {
                                        /* found it */
                                        match = 1;

diff --git a/servers/slapd/back-bdb/compare.c b/servers/slapd/back-bdb/compare.c
index 4f2ab650c55517873d53e7e772fc737b8b8e2e77..919426fa4e137b9397805061122d90ffd00099f9 100644 (file)
--- a/servers/slapd/back-bdb/compare.c
+++ b/servers/slapd/back-bdb/compare.c
@@ -127,8 +127,9 @@ dn2entry_retry:
 
 #ifdef SLAP_NVALUES
                if ( value_find_ex( ava->aa_desc,
-                       SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
-                       a->a_vals, &ava->aa_value ) == 0 )
+                       SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
+                               SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+                       a->a_nvals ? a->a_nvals : a->a_vals, &ava->aa_value ) == 0 )
 #else
                if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 )
 #endif

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 10b3b171061f872e1a835264a75695a350d56863..5f2cff0d813199f47b48765fa422fc0b204b285a 100644 (file)
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -216,7 +216,15 @@ dn2entry_retry:
                group_oc_name, group_at_name, 0 ); 
 #endif
 
-       if( value_find_ex( group_at, 0, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
+#ifdef SLAP_NVALUES
+       if( value_find_ex( group_at, SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH
+                       | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+               attr->a_nvals ? attr->a_nvals : attr->a_vals,
+               op_ndn ) != LDAP_SUCCESS )
+#else
+       if( value_find_ex( group_at, 0, attr->a_vals, op_ndn ) != LDAP_SUCCESS )
+#endif
+       {
 #ifdef NEW_LOGGING
                LDAP_LOG( BACK_BDB, DETAIL1, 
                        "bdb_group: \"%s\" not in \"%s\": %s\n",