}
(*vals)[n + j] = NULL;
- return( 0 );
+ return LDAP_SUCCESS;
}
#ifdef SLAPD_SCHEMA_NOT_COMPAT
return LDAP_INVALID_SYNTAX;
}
+ } else if ( mr->smr_syntax->ssyn_normalize ) {
+ rc = (mr->smr_syntax->ssyn_normalize)(
+ ad->ad_type->sat_syntax,
+ in, out );
+
+ if( rc != LDAP_SUCCESS ) {
+ *text = "unable to normalize value";
+ return LDAP_INVALID_SYNTAX;
+ }
+
} else {
*out = ber_bvdup( in );
}
int *match,
AttributeDescription *ad,
MatchingRule *mr,
- struct berval *v1, /* (unnormalized) stored value */
- struct berval *v2, /* (normalized) asserted value */
+ struct berval *v1, /* stored value */
+ void *v2, /* assertion */
const char ** text )
{
int rc;
int usage = 0;
struct berval *nv1 = NULL;
+ if( !mr->smr_match ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
if( ad->ad_type->sat_syntax->ssyn_normalize ) {
rc = ad->ad_type->sat_syntax->ssyn_normalize(
ad->ad_type->sat_syntax, v1, &nv1 );
}
}
- if( !mr->smr_match ) {
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-
rc = (mr->smr_match)( match, usage,
ad->ad_type->sat_syntax,
mr,
#ifdef SLAPD_SCHEMA_NOT_COMPAT
int value_find(
AttributeDescription *ad,
- MatchingRule *mr,
struct berval **vals,
- struct berval *val,
- const char ** text )
+ struct berval *val )
#else
int
value_find(
#endif
{
int i;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ int rc;
+ struct berval *nval = NULL;
+ MatchingRule *mr = ad->ad_type->sat_equality;
+
+ if( mr == NULL || !mr->smr_match ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ if( mr->smr_syntax->ssyn_normalize ) {
+ rc = mr->smr_syntax->ssyn_normalize(
+ mr->smr_syntax, val, &nval );
+
+ if( rc != LDAP_SUCCESS ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+ }
+#endif
for ( i = 0; vals[i] != NULL; i++ ) {
#ifdef SLAPD_SCHEMA_NOT_COMPAT
- int rc;
int match;
- rc = value_match( &match, ad, mr, vals[i], val, text );
+ const char *text;
+
+ rc = value_match( &match, ad, mr, vals[i],
+ nval == NULL ? val : nval, &text );
if( rc == LDAP_SUCCESS && match == 0 )
#else