From 9c5768cd8e75d7c272f28ddb51fb112a5aa15312 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 17 Sep 2004 21:43:28 +0000
Subject: [PATCH] Initial ITS#3333 fix (needs to be applied to other filter
 cases)

---
 servers/slapd/filterentry.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 6380d45297..4283a818c6 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -359,6 +359,7 @@ test_ava_filter(
 	AttributeAssertion *ava,
 	int		type )
 {
+	int rc;
 	Attribute	*a;
 
 	if ( !access_allowed( op, e,
@@ -423,6 +424,8 @@ test_ava_filter(
 		return LDAP_COMPARE_FALSE;
 	}
 
+	rc = LDAP_COMPARE_FALSE;
+
 	for(a = attrs_find( e->e_attrs, ava->aa_desc );
 		a != NULL;
 		a = attrs_find( a->a_next, ava->aa_desc ) )
@@ -430,6 +433,13 @@ test_ava_filter(
 		MatchingRule *mr;
 		struct berval *bv;
 
+		if (( ava->aa_desc != a->a_desc ) && !access_allowed( op, e,
+			a->a_desc, &ava->aa_value, ACL_SEARCH, NULL ))
+		{
+			rc = LDAP_INSUFFICIENT_ACCESS;
+			continue;
+		}
+
 		switch ( type ) {
 		case LDAP_FILTER_APPROX:
 			mr = a->a_desc->ad_type->sat_approx;
@@ -450,17 +460,23 @@ test_ava_filter(
 			mr = NULL;
 		}
 
-		if( mr == NULL ) continue;
+		if( mr == NULL ) {
+			rc = LDAP_OTHER;
+			continue;
+		}
 
 		for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
 			int ret;
-			int rc;
+			int tmprc;
 			const char *text;
 
-			rc = value_match( &ret, a->a_desc, mr, 0,
+			tmprc = value_match( &ret, a->a_desc, mr, 0,
 				bv, &ava->aa_value, &text );
 
-			if( rc != LDAP_SUCCESS ) return rc;
+			if( tmprc != LDAP_SUCCESS ) {
+				rc = tmprc;
+				continue;
+			}
 
 			switch ( type ) {
 			case LDAP_FILTER_EQUALITY:
@@ -479,7 +495,7 @@ test_ava_filter(
 		}
 	}
 
-	return LDAP_COMPARE_FALSE;
+	return rc;
 }
 
 
-- 
2.39.5