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

diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index 51c223e97d..0d3986ae2b 100644
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -358,16 +358,9 @@ test_mra_vrFilter(
 	for ( i=0; a != NULL; a = a->a_next, i++ ) {
 		struct berval *bv, value;
 
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
-		if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
-			return( LDAP_SUCCESS );
-		}
-		value = mra->ma_value;
-
-#else /* SLAP_X_MRA_MATCH_DNATTRS */
 		if ( mra->ma_desc ) {
 			if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
-				return( LDAP_SUCCESS );
+				continue;
 			}
 			value = mra->ma_value;
 
@@ -389,7 +382,6 @@ test_mra_vrFilter(
 			}
 
 		}
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
 
 		for ( bv = a->a_vals, j = 0; bv->bv_val != NULL; bv++, j++ ) {
 			int ret;