/* value.c - routines for dealing with values */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
#include "portable.h"
-#include "slap.h"
-int
-value_add_fast(
- struct berval ***vals,
- struct berval **addvals,
- int nvals,
- int naddvals,
- int *maxvals
-)
-{
- int need, i, j;
+#include <stdio.h>
- 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 *) );
- }
+#include <ac/ctype.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
- for ( i = 0, j = 0; i < naddvals; i++, j++ ) {
- if ( addvals[i]->bv_len > 0 ) {
- (*vals)[nvals + j] = ber_bvdup( addvals[i] );
- }
- }
- (*vals)[nvals + j] = NULL;
+#include <sys/stat.h>
- return( 0 );
-}
+#include "slap.h"
int
value_add(
for ( i = 0, j = 0; i < nn; i++ ) {
if ( addvals[i]->bv_len > 0 ) {
- (*vals)[n + j++] = ber_bvdup( addvals[i] );
+ (*vals)[n + j] = ber_bvdup( addvals[i] );
+ if( (*vals)[n + j++] == NULL ) break;
}
}
(*vals)[n + j] = NULL;
- return( 0 );
+ return LDAP_SUCCESS;
}
-void
+
+int
value_normalize(
- char *s,
- int syntax
-)
+ AttributeDescription *ad,
+ unsigned usage,
+ struct berval *in,
+ struct berval **out,
+ const char **text )
{
- char *d, *save;
+ int rc;
+ MatchingRule *mr;
- if ( ! (syntax & SYNTAX_CIS) ) {
- return;
+ switch( usage & SLAP_MR_TYPE_MASK ) {
+ case SLAP_MR_NONE:
+ case SLAP_MR_EQUALITY:
+ mr = ad->ad_type->sat_equality;
+ break;
+ case SLAP_MR_ORDERING:
+ mr = ad->ad_type->sat_ordering;
+ break;
+ case SLAP_MR_SUBSTR:
+ mr = ad->ad_type->sat_substr;
+ break;
+ case SLAP_MR_EXT:
+ default:
+ assert( 0 );
+ *text = "internal error";
+ return LDAP_OTHER;
}
- if ( syntax & SYNTAX_DN ) {
- (void) dn_normalize_case( s );
- return;
+ if( mr == NULL ) {
+ *text = "inappropriate matching request";
+ return LDAP_INAPPROPRIATE_MATCHING;
}
- save = s;
- for ( d = s; *s; s++ ) {
- if ( (syntax & SYNTAX_TEL) && (*s == ' ' || *s == '-') ) {
- continue;
- }
- *d++ = TOUPPER( *s );
+ /* we only support equality matching of binary attributes */
+ if( slap_ad_is_binary( ad ) && usage != SLAP_MR_EQUALITY ) {
+ *text = "inappropriate binary matching";
+ return LDAP_INAPPROPRIATE_MATCHING;
}
- *d = '\0';
-}
-#define MIN( a, b ) (a < b ? a : b )
+ if( mr->smr_normalize ) {
+ rc = (mr->smr_normalize)( usage,
+ ad->ad_type->sat_syntax,
+ mr, in, out );
-int
-value_cmp(
- struct berval *v1,
- struct berval *v2,
- int syntax,
- int normalize /* 1 => arg 1; 2 => arg 2; 3 => both */
-)
-{
- int rc;
- struct stat st1, st2;
-
- 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 );
- }
-
- 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( rc != LDAP_SUCCESS ) {
+ *text = "unable to normalize value";
+ return LDAP_INVALID_SYNTAX;
+ }
- case SYNTAX_CES:
- rc = strcmp( v1->bv_val, v2->bv_val );
- break;
+ } else if ( mr->smr_syntax->ssyn_normalize ) {
+ rc = (mr->smr_syntax->ssyn_normalize)(
+ ad->ad_type->sat_syntax,
+ in, out );
- case SYNTAX_BIN:
- rc = memcmp( v1->bv_val, v2->bv_val, MIN( v1->bv_len,
- v2->bv_len ) );
- break;
- }
+ if( rc != LDAP_SUCCESS ) {
+ *text = "unable to normalize value";
+ return LDAP_INVALID_SYNTAX;
+ }
- if ( normalize & 1 ) {
- ber_bvfree( v1 );
- }
- if ( normalize & 2 ) {
- ber_bvfree( v2 );
+ } else {
+ *out = ber_bvdup( in );
}
- return( rc );
+ return LDAP_SUCCESS;
}
+
int
-value_ncmp(
- struct berval *v1,
- struct berval *v2,
- int syntax,
- int len,
- int normalize
-)
+value_match(
+ int *match,
+ AttributeDescription *ad,
+ MatchingRule *mr,
+ unsigned flags,
+ struct berval *v1, /* stored value */
+ void *v2, /* assertion */
+ const char ** text )
{
- int rc;
+ int rc;
+ struct berval *nv1 = NULL;
- 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->smr_match ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
}
- switch ( syntax ) {
- case SYNTAX_CIS:
- case (SYNTAX_CIS | SYNTAX_TEL):
- rc = strncasecmp( v1->bv_val, v2->bv_val, len );
- break;
-
- case SYNTAX_CES:
- rc = strncmp( v1->bv_val, v2->bv_val, len );
- break;
-
- case SYNTAX_BIN:
- rc = memcmp( v1->bv_val, v2->bv_val, len );
- }
+ if( ad->ad_type->sat_syntax->ssyn_normalize ) {
+ rc = ad->ad_type->sat_syntax->ssyn_normalize(
+ ad->ad_type->sat_syntax, v1, &nv1 );
- if ( normalize & 1 ) {
- ber_bvfree( v1 );
- }
- if ( normalize & 2 ) {
- ber_bvfree( v2 );
+ if( rc != LDAP_SUCCESS ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
}
- return( rc );
+ rc = (mr->smr_match)( match, flags,
+ ad->ad_type->sat_syntax,
+ mr,
+ nv1 != NULL ? nv1 : v1,
+ v2 );
+
+ ber_bvfree( nv1 );
+ return rc;
}
-int
-value_find(
- struct berval **vals,
- struct berval *v,
- int syntax,
- int normalize
-)
+
+int value_find(
+ AttributeDescription *ad,
+ struct berval **vals,
+ struct berval *val )
{
int i;
+ 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;
+ }
+ }
for ( i = 0; vals[i] != NULL; i++ ) {
- if ( value_cmp( vals[i], v, syntax, normalize ) == 0 ) {
- return( 0 );
+ int match;
+ const char *text;
+
+ rc = value_match( &match, ad, mr, 0,
+ vals[i], nval == NULL ? val : nval, &text );
+
+ if( rc == LDAP_SUCCESS && match == 0 ) {
+ ber_bvfree( nval );
+ return LDAP_SUCCESS;
}
}
- return( 1 );
+ ber_bvfree( nval );
+ return LDAP_NO_SUCH_ATTRIBUTE;
}
projects / openldap / blobdiff