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 21538c23e18a281a7d46e671b3360e737b000b96..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
@@ -128,13 +128,28 @@ 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 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 );
        }
 
        return LDAP_SUCCESS;
@@ -172,15 +187,40 @@ value_normalize(
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 int
 value_match(
+       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 )
 {
-       /* not yet implemented */
-       return 0;
+       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( rc != LDAP_SUCCESS ) {
+                       return LDAP_INAPPROPRIATE_MATCHING;
+               }
+       }
+
+       rc = (mr->smr_match)( match, usage,
+               ad->ad_type->sat_syntax,
+               mr,
+               nv1 != NULL ? nv1 : v1,
+               v2 );
+       
+       ber_bvfree( nv1 );
+       return rc;
 }
+
 #else
 int
 value_cmp(
@@ -234,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(
@@ -248,10 +286,34 @@ 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
-               if ( value_match( ad, mr, vals[i], val, text ) == 0 )
+               int match;
+               const char *text;
+
+               rc = value_match( &match, ad, mr, vals[i],
+                       nval == NULL ? val : nval, &text );
+
+               if( rc == LDAP_SUCCESS && match == 0 )
 #else
                if ( value_cmp( vals[i], v, syntax, normalize ) == 0 )
 #endif