From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 15 Mar 2003 22:47:17 +0000 (+0000)
Subject: NVALUES: fix a couple of value_find_ex() calls
X-Git-Tag: NO_SLAP_OP_BLOCKS~111
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3972e13fc3de47d46a1d81655fac9b1baaae5622;p=openldap

NVALUES: fix a couple of value_find_ex() calls
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 592eb0f21e..9f7be5ef59 100644
--- 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 4f2ab650c5..919426fa4e 100644
--- 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 10b3b17106..5f2cff0d81 100644
--- 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",