X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilterentry.c;h=af513e29c565ca7035d0529a0ca3db57d1ab9c12;hb=62139b6ef3634529c6d1ff726c337e685ea38cf8;hp=706e774841d2b27352eb4c35a18d386bf386e64b;hpb=9eac390e2fa575a24cb9216c9afec46b1c33b640;p=openldap

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 706e774841..af513e29c5 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -227,38 +227,12 @@ static int test_mra_filter(
 {
 	Attribute	*a;
 
-	if( mra->ma_desc == NULL || mra->ma_dnattrs ) {
-		return LDAP_INAPPROPRIATE_MATCHING;
-	}
-
 	if( !access_allowed( be, conn, op, e,
 		mra->ma_desc, &mra->ma_value, ACL_SEARCH, NULL ) )
 	{
 		return LDAP_INSUFFICIENT_ACCESS;
 	}
 
-	/* no matching rule was provided, use the attribute's
-	   equality rule if it supports extensible matching. */
-	if( mra->ma_rule == NULL && 
-		mra->ma_desc->ad_type->sat_equality &&
-		mra->ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
-	{
-		mra->ma_rule = mra->ma_desc->ad_type->sat_equality;
-
-	} else {
-		return LDAP_INAPPROPRIATE_MATCHING;
-	}
-
-	/* check to see if the matching rule is appropriate for
-	   the syntax of the attribute.  This check will need
-	   to be extended to support other kinds of extensible
-	   matching rules */
-	if( strcmp(mra->ma_rule->smr_syntax->ssyn_oid,
-		mra->ma_desc->ad_type->sat_syntax->ssyn_oid) != 0)
-	{
-		return LDAP_INAPPROPRIATE_MATCHING;
-	}
-
 	for(a = attrs_find( e->e_attrs, mra->ma_desc );
 		a != NULL;
 		a = attrs_find( a->a_next, mra->ma_desc ) )