From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 31 Aug 2002 21:39:42 +0000 (+0000)
Subject: have get_mra use mr_usable_with_at() as well
X-Git-Tag: NO_SLAP_OP_BLOCKS~1050
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b5f51ed4a5168095af6bfb561191affee59eba8a;p=openldap

have get_mra use mr_usable_with_at() as well
---

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index fbd3a6afa9..4c2cb54d99 100644
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -219,7 +219,7 @@ get_mra(
 		 */
 		if ( ma->ma_desc == NULL ) {
 			mra_free( ma, 1 );
-			*text = "matching rule not recognized";
+			*text = "no matching rule or type";
 			return LDAP_INAPPROPRIATE_MATCHING;
 		}
 #endif /* !SLAP_X_MRA_MATCH_DNATTRS */
@@ -232,6 +232,7 @@ get_mra(
 			ma->ma_rule = ma->ma_desc->ad_type->sat_equality;
 
 		} else {
+			*text = "no appropriate rule to use for type";
 			mra_free( ma, 1 );
 			return LDAP_INAPPROPRIATE_MATCHING;
 		}
@@ -247,6 +248,7 @@ get_mra(
 
 	} else {
 		mra_free( ma, 1 );
+		*text = "no appropriate matching rule";
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 #endif
@@ -254,14 +256,9 @@ get_mra(
 #ifdef SLAP_X_MRA_MATCH_DNATTRS
 	if ( ma->ma_desc != NULL ) {
 #endif /* SLAP_X_MRA_MATCH_DNATTRS */
-		/* 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( ma->ma_rule->smr_syntax->ssyn_oid,
-			ma->ma_desc->ad_type->sat_syntax->ssyn_oid ) != 0 )
-		{
+		if( !mr_usable_with_at( ma->ma_rule, ma->ma_desc->ad_type ) ) {
 			mra_free( ma, 1 );
+			*text = "matching rule use with this attribute not appropriate";
 			return LDAP_INAPPROPRIATE_MATCHING;
 		}