- for ( i = 0; vals[i] != NULL; i++ ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( value_match( ad, mr, vals[i], val, text ) == 0 )
-#else
- if ( value_cmp( vals[i], v, syntax, normalize ) == 0 )
-#endif
- {
+ if( mr == NULL || !mr->smr_match ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ /* Take care of this here or ssyn_normalize later will hurt */
+ if ( SLAP_IS_MR_VALUE_SYNTAX_NONCONVERTED_MATCH( flags )
+ && mr->smr_convert )
+ {
+ rc = (mr->smr_convert)( val, &nval );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ /* let value_match know we've done the version */
+ flags |= SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH;
+ }
+
+ if( !(flags & SLAP_MR_VALUE_NORMALIZED_MATCH) &&
+ mr->smr_syntax->ssyn_normalize ) {
+ struct berval nval_tmp = { 0, NULL };
+
+ rc = mr->smr_syntax->ssyn_normalize(
+ mr->smr_syntax,
+ nval.bv_val == NULL ? val : &nval, &nval_tmp );
+
+ free(nval.bv_val);
+ nval = nval_tmp;
+ if( rc != LDAP_SUCCESS ) {
+ free(nval.bv_val);
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+ }
+
+ for ( i = 0; vals[i].bv_val != NULL; i++ ) {
+ int match;
+ const char *text;
+
+ rc = value_match( &match, ad, mr, flags,
+ &vals[i], nval.bv_val == NULL ? val : &nval, &text );
+
+ if( rc == LDAP_SUCCESS && match == 0 ) {
+ free( nval.bv_val );