much better fix for ITS#2196 (dnattr without sat_equality is bounced at config)

This commit is contained in:
Pierangelo Masarati 2002-11-25 18:37:04 +00:00
parent 65efd6a185
commit a62aa61544
2 changed files with 12 additions and 4 deletions

View file

@ -464,6 +464,15 @@ parse_acl(
acl_usage();
}
if( b->a_dn_at->ad_type->sat_equality == NULL )
{
fprintf( stderr,
"%s: line %d: dnattr \"%s\": "
"inappropriate matching (no EQUALITY)\n",
fname, lineno, right );
acl_usage();
}
continue;
}

View file

@ -324,10 +324,9 @@ value_match(
struct berval nv1 = { 0, NULL };
struct berval nv2 = { 0, NULL };
/*
* FIXME: mr should NOT be NULL ...
*/
if( !mr || !mr->smr_match ) {
assert( mr != NULL );
if( !mr->smr_match ) {
return LDAP_INAPPROPRIATE_MATCHING;
}