X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FmatchedValues.c;h=0d3986ae2b4f8da8397134954c7318c0aa11a067;hb=4e4818771c26a4c02808130970f2a5e4c216ef52;hp=483a14956d225e1f988caa2bf4636202ff340a42;hpb=6107ba67d2fd7eadb23ffdd1d284306011ef4013;p=openldap

diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index 483a14956d..0d3986ae2b 100644
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -19,7 +19,8 @@
 
 #include "../../libraries/liblber/lber-int.h"
 
-static int test_mra_vrFilter(
+static int
+test_mra_vrFilter(
 	Backend 	*be,
 	Connection 	*conn,
 	Operation	*op,
@@ -342,7 +343,8 @@ test_substrings_vrFilter(
 	return LDAP_SUCCESS;
 }
 
-static int test_mra_vrFilter(
+static int
+test_mra_vrFilter(
 	Backend 	*be,
 	Connection 	*conn,
 	Operation	*op,
@@ -354,10 +356,31 @@ static int test_mra_vrFilter(
 	int i, j;
 
 	for ( i=0; a != NULL; a = a->a_next, i++ ) {
-		struct berval *bv;
-	
-		if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
-			return( LDAP_SUCCESS );
+		struct berval *bv, value;
+
+		if ( mra->ma_desc ) {
+			if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
+				continue;
+			}
+			value = mra->ma_value;
+
+		} else {
+			const char	*text = NULL;
+
+			/* check if matching is appropriate */
+			if ( strcmp( mra->ma_rule->smr_syntax->ssyn_oid,
+				a->a_desc->ad_type->sat_syntax->ssyn_oid ) != 0 ) {
+				continue;
+			}
+
+			/* normalize for equality */
+			if ( value_validate_normalize( a->a_desc, 
+				SLAP_MR_EQUALITY,
+				&mra->ma_value, &value,
+				&text ) != LDAP_SUCCESS ) {
+				continue;
+			}
+
 		}
 
 		for ( bv = a->a_vals, j = 0; bv->bv_val != NULL; bv++, j++ ) {
@@ -367,14 +390,14 @@ static int test_mra_vrFilter(
 
 			rc = value_match( &ret, a->a_desc, mra->ma_rule,
 				SLAP_MR_ASSERTION_SYNTAX_MATCH,
-				bv, &mra->ma_value,
+				bv, &value,
 				&text );
 
 			if( rc != LDAP_SUCCESS ) {
 				return rc;
 			}
 
-			if ( ret ) {
+			if ( ret == 0 ) {
 				(*e_flags)[i][j] = 1;
 			}
 		}