mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

have get_mra use mr_usable_with_at() as well

Browse Source
This commit is contained in:
Kurt Zeilenga 2002-08-31 21:39:42 +00:00
parent c6052ac8b0
commit b5f51ed4a5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
servers/slapd/mra.c
View File

@ -219,7 +219,7 @@ get_mra(
*/ */
if ( ma->ma_desc == NULL ) { if ( ma->ma_desc == NULL ) {
mra_free( ma, 1 ); mra_free( ma, 1 );
*text = "matching rule not recognized"; *text = "no matching rule or type";
return LDAP_INAPPROPRIATE_MATCHING; return LDAP_INAPPROPRIATE_MATCHING;
} }
#endif /* !SLAP_X_MRA_MATCH_DNATTRS */ #endif /* !SLAP_X_MRA_MATCH_DNATTRS */
@ -232,6 +232,7 @@ get_mra(
ma->ma_rule = ma->ma_desc->ad_type->sat_equality; ma->ma_rule = ma->ma_desc->ad_type->sat_equality;
} else { } else {
*text = "no appropriate rule to use for type";
mra_free( ma, 1 ); mra_free( ma, 1 );
return LDAP_INAPPROPRIATE_MATCHING; return LDAP_INAPPROPRIATE_MATCHING;
} }
@ -247,6 +248,7 @@ get_mra(
} else { } else {
mra_free( ma, 1 ); mra_free( ma, 1 );
*text = "no appropriate matching rule";
return LDAP_INAPPROPRIATE_MATCHING; return LDAP_INAPPROPRIATE_MATCHING;
} }
#endif #endif
@ -254,14 +256,9 @@ get_mra(
#ifdef SLAP_X_MRA_MATCH_DNATTRS #ifdef SLAP_X_MRA_MATCH_DNATTRS
if ( ma->ma_desc != NULL ) { if ( ma->ma_desc != NULL ) {
#endif /* SLAP_X_MRA_MATCH_DNATTRS */ #endif /* SLAP_X_MRA_MATCH_DNATTRS */
/* check to see if the matching rule is appropriate for if( !mr_usable_with_at( ma->ma_rule, ma->ma_desc->ad_type ) ) {
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 )
{
mra_free( ma, 1 ); mra_free( ma, 1 );
*text = "matching rule use with this attribute not appropriate";
return LDAP_INAPPROPRIATE_MATCHING; return LDAP_INAPPROPRIATE_MATCHING;
} }