SLAPD_SCHEMA_NOT_COMPAT: at least make filters not loop

This commit is contained in:
Kurt Zeilenga 2000-05-23 23:52:25 +00:00
parent 5ab4c575f4
commit 3657e63a17
2 changed files with 14 additions and 7 deletions

View File

@ -260,7 +260,9 @@ test_ava_filter(
for ( i = 0; a->a_vals[i] != NULL; i++ ) {
int rc;
#ifndef SLAPD_SCHEMA_NOT_COMPAT
#ifdef SLAPD_SCHEMA_NOT_COMPAT
rc = 0;
#else
rc = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax,
3 );
#endif

View File

@ -128,13 +128,18 @@ value_normalize(
return LDAP_INAPPROPRIATE_MATCHING;
}
rc = (mr->smr_normalize)( usage,
ad->ad_type->sat_syntax,
mr, in, out );
if( mr->smr_normalize ) {
rc = (mr->smr_normalize)( usage,
ad->ad_type->sat_syntax,
mr, in, out );
if( rc != LDAP_SUCCESS ) {
*text = "unable to normalize value";
return LDAP_INVALID_SYNTAX;
if( rc != LDAP_SUCCESS ) {
*text = "unable to normalize value";
return LDAP_INVALID_SYNTAX;
}
} else {
*out = ber_bvdup( in );
}
return LDAP_SUCCESS;