Use "uri" directive (instead of "server") to specify server. Add "bin

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 05af2ff085603ac08d4a3c26200e0cdcdde66611..4b4ecc3bd8134ead40686440fb427242577b8fbe 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -48,7 +48,7 @@ value_add(
        }
        (*vals)[n + j] = NULL;
 
-       return( 0 );
+       return LDAP_SUCCESS;
 }
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
@@ -198,6 +198,10 @@ value_match(
        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 );
@@ -207,10 +211,6 @@ value_match(
                }
        }
 
-       if( !mr->smr_match ) {
-               return LDAP_INAPPROPRIATE_MATCHING;
-       }
-
        rc = (mr->smr_match)( match, usage,
                ad->ad_type->sat_syntax,
                mr,
@@ -274,10 +274,8 @@ value_cmp(
 #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(
@@ -288,12 +286,32 @@ 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