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

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 94724f8da5..af513e29c5 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -228,22 +228,11 @@ static int test_mra_filter(
 	Attribute	*a;
 
 	if( !access_allowed( be, conn, op, e,
-		mra->ma_desc, &mra->ma_value, ACL_SEARCH ) )
+		mra->ma_desc, &mra->ma_value, ACL_SEARCH, NULL ) )
 	{
 		return LDAP_INSUFFICIENT_ACCESS;
 	}
 
-	if( strcmp(mra->ma_rule->smr_syntax->ssyn_oid,
-		mra->ma_desc->ad_type->sat_syntax->ssyn_oid) != 0)
-	{
-		return LDAP_INVALID_SYNTAX;
-	}
-
-	if( mra->ma_rule == NULL )
-	{
-		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 ) )
@@ -263,7 +252,7 @@ static int test_mra_filter(
 				return rc;
 			}
 
-			if ( ret ) {
+			if ( ret == 0 ) {
 				return LDAP_COMPARE_TRUE;
 			}
 		}
@@ -285,7 +274,7 @@ test_ava_filter(
 	Attribute	*a;
 
 	if ( !access_allowed( be, conn, op, e,
-		ava->aa_desc, &ava->aa_value, ACL_SEARCH ) )
+		ava->aa_desc, &ava->aa_value, ACL_SEARCH, NULL ) )
 	{
 		return LDAP_INSUFFICIENT_ACCESS;
 	}
@@ -370,7 +359,7 @@ test_presence_filter(
 	AttributeDescription *desc
 )
 {
-	if ( !access_allowed( be, conn, op, e, desc, NULL, ACL_SEARCH ) )
+	if ( !access_allowed( be, conn, op, e, desc, NULL, ACL_SEARCH, NULL ) )
 	{
 		return LDAP_INSUFFICIENT_ACCESS;
 	}
@@ -491,7 +480,7 @@ test_substrings_filter(
 
 
 	if ( !access_allowed( be, conn, op, e,
-		f->f_sub_desc, NULL, ACL_SEARCH ) )
+		f->f_sub_desc, NULL, ACL_SEARCH, NULL ) )
 	{
 		return LDAP_INSUFFICIENT_ACCESS;
 	}