mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

SLAPD_SCHEMA_NOT_COMPAT: at least make filters not loop

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/filterentry.c
View File

@ -260,7 +260,9 @@ test_ava_filter(
for ( i = 0; a->a_vals[i] != NULL; i++ ) { for ( i = 0; a->a_vals[i] != NULL; i++ ) {
int rc; 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, rc = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax,
3 ); 3 );
#endif #endif

17
servers/slapd/value.c
View File

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