Add a sample ACL

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 9c922607015d6a971fcf08d7c62b07c37f648396..e4b9ee0ed6c4ea05ae9e61947c6f629cf385febd 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -48,53 +48,17 @@ value_add(
        }
        (*vals)[n + j] = NULL;
 
-       return( 0 );
+       return LDAP_SUCCESS;
 }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       /* not yet implemented */
-#else
-int
-value_add_fast( 
-    struct berval      ***vals,
-    struct berval      **addvals,
-    int                        nvals,
-    int                        naddvals,
-    int                        *maxvals
-)
-{
-       int     need, i, j;
-
-       if ( *maxvals == 0 ) {
-               *maxvals = 1;
-       }
-       need = nvals + naddvals + 1;
-       while ( *maxvals < need ) {
-               *maxvals *= 2;
-               *vals = (struct berval **) ch_realloc( (char *) *vals,
-                   *maxvals * sizeof(struct berval *) );
-       }
-
-       for ( i = 0, j = 0; i < naddvals; i++ ) {
-               if ( addvals[i]->bv_len > 0 ) {
-                       (*vals)[nvals + j] = ber_bvdup( addvals[i] );
-                       if( (*vals)[nvals + j] != NULL ) j++;
-               }
-       }
-       (*vals)[nvals + j] = NULL;
-
-       return( 0 );
-}
-#endif
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 int
 value_normalize(
        AttributeDescription *ad,
        unsigned usage,
        struct berval *in,
        struct berval **out,
-       char **text )
+       const char **text )
 {
        int rc;
        MatchingRule *mr;
@@ -128,114 +92,107 @@ 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;
+               }
+
+       } 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;
+               }
 
-       if( rc != LDAP_SUCCESS ) {
-               *text = "unable to normalize value";
-               return LDAP_INVALID_SYNTAX;
+       } else {
+               *out = ber_bvdup( in );
        }
 
        return LDAP_SUCCESS;
 }
 
-#else
-void
-value_normalize(
-    char       *s,
-    int                syntax
-)
+
+int
+value_match(
+       int *match,
+       AttributeDescription *ad,
+       MatchingRule *mr,
+       unsigned flags,
+       struct berval *v1, /* stored value */
+       void *v2, /* assertion */
+       const char ** text )
 {
-       char    *d, *save;
+       int rc;
+       struct berval *nv1 = NULL;
 
-       if ( ! (syntax & SYNTAX_CIS) ) {
-               return;
+       if( !mr->smr_match ) {
+               return LDAP_INAPPROPRIATE_MATCHING;
        }
 
-       if ( syntax & SYNTAX_DN ) {
-               (void) dn_normalize( s );
-               return;
-       }
+       if( ad->ad_type->sat_syntax->ssyn_normalize ) {
+               rc = ad->ad_type->sat_syntax->ssyn_normalize(
+                       ad->ad_type->sat_syntax, v1, &nv1 );
 
-       save = s;
-       for ( d = s; *s; s++ ) {
-               if ( (syntax & SYNTAX_TEL) && (*s == ' ' || *s == '-') ) {
-                       continue;
+               if( rc != LDAP_SUCCESS ) {
+                       return LDAP_INAPPROPRIATE_MATCHING;
                }
-               *d++ = TOUPPER( (unsigned char) *s );
        }
-       *d = '\0';
+
+       rc = (mr->smr_match)( match, flags,
+               ad->ad_type->sat_syntax,
+               mr,
+               nv1 != NULL ? nv1 : v1,
+               v2 );
+       
+       ber_bvfree( nv1 );
+       return rc;
 }
-#endif
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       /* not yet implemented */
-#else
-int
-value_cmp(
-    struct berval      *v1,
-    struct berval      *v2,
-    int                        syntax,
-    int                        normalize       /* 1 => arg 1; 2 => arg 2; 3 => both */
-)
+
+int value_find(
+       AttributeDescription *ad,
+       struct berval **vals,
+       struct berval *val )
 {
-       int             rc;
+       int     i;
+       int rc;
+       struct berval *nval = NULL;
+       MatchingRule *mr = ad->ad_type->sat_equality;
 
-       if ( normalize & 1 ) {
-               v1 = ber_bvdup( v1 );
-               value_normalize( v1->bv_val, syntax );
-       }
-       if ( normalize & 2 ) {
-               v2 = ber_bvdup( v2 );
-               value_normalize( v2->bv_val, syntax );
+       if( mr == NULL || !mr->smr_match ) {
+               return LDAP_INAPPROPRIATE_MATCHING;
        }
 
-       switch ( syntax ) {
-       case SYNTAX_CIS:
-       case (SYNTAX_CIS | SYNTAX_TEL):
-       case (SYNTAX_CIS | SYNTAX_DN):
-               rc = strcasecmp( v1->bv_val, v2->bv_val );
-               break;
+       if( mr->smr_syntax->ssyn_normalize ) {
+               rc = mr->smr_syntax->ssyn_normalize(
+                       mr->smr_syntax, val, &nval );
 
-       case SYNTAX_CES:
-               rc = strcmp( v1->bv_val, v2->bv_val );
-               break;
-
-       default:        /* Unknown syntax */
-       case SYNTAX_BIN:
-               rc = (v1->bv_len == v2->bv_len
-                     ? memcmp( v1->bv_val, v2->bv_val, v1->bv_len )
-                     : v1->bv_len > v2->bv_len ? 1 : -1);
-               break;
-       }
-
-       if ( normalize & 1 ) {
-               ber_bvfree( v1 );
-       }
-       if ( normalize & 2 ) {
-               ber_bvfree( v2 );
+               if( rc != LDAP_SUCCESS ) {
+                       return LDAP_INAPPROPRIATE_MATCHING;
+               }
        }
 
-       return( rc );
-}
+       for ( i = 0; vals[i] != NULL; i++ ) {
+               int match;
+               const char *text;
 
-int
-value_find(
-    struct berval      **vals,
-    struct berval      *v,
-    int                        syntax,
-    int                        normalize
-)
-{
-       int     i;
+               rc = value_match( &match, ad, mr, 0,
+                       vals[i], nval == NULL ? val : nval, &text );
 
-       for ( i = 0; vals[i] != NULL; i++ ) {
-               if ( value_cmp( vals[i], v, syntax, normalize ) == 0 ) {
-                       return( 0 );
+               if( rc == LDAP_SUCCESS && match == 0 ) {
+                       ber_bvfree( nval );
+                       return LDAP_SUCCESS;
                }
        }
 
-       return( 1 );
+       ber_bvfree( nval );
+       return LDAP_NO_SUCH_ATTRIBUTE;
 }
-#endif