/* value.c - routines for dealing with values */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
int
value_add(
- struct berval ***vals,
- struct berval **addvals
+ BerVarray *vals,
+ BerVarray addvals
)
{
- int n, nn, i, j;
+ int n, nn;
+ BerVarray v2;
- for ( nn = 0; addvals != NULL && addvals[nn] != NULL; nn++ )
+ for ( nn = 0; addvals != NULL && addvals[nn].bv_val != NULL; nn++ )
; /* NULL */
if ( *vals == NULL ) {
- *vals = (struct berval **) ch_malloc( (nn + 1)
- * sizeof(struct berval *) );
+ *vals = (BerVarray) ch_malloc( (nn + 1)
+ * sizeof(struct berval) );
n = 0;
} else {
- for ( n = 0; (*vals)[n] != NULL; n++ )
- ; /* NULL */
- *vals = (struct berval **) ch_realloc( (char *) *vals,
- (n + nn + 1) * sizeof(struct berval *) );
+ for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+ ; /* Empty */
+ }
+ *vals = (BerVarray) ch_realloc( (char *) *vals,
+ (n + nn + 1) * sizeof(struct berval) );
}
- for ( i = 0, j = 0; i < nn; i++ ) {
- if ( addvals[i]->bv_len > 0 ) {
- (*vals)[n + j] = ber_bvdup( addvals[i] );
- if( (*vals)[n + j++] == NULL ) break;
- }
+ v2 = *vals + n;
+ for ( ; addvals->bv_val; v2++, addvals++ ) {
+ ber_dupbv(v2, addvals);
+ if (v2->bv_val == NULL) break;
}
- (*vals)[n + j] = NULL;
+ v2->bv_val = NULL;
+ v2->bv_len = 0;
return LDAP_SUCCESS;
}
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-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,
+ struct berval *out,
const char **text )
{
int rc;
}
/* we only support equality matching of binary attributes */
+ /* This is suspect, flexible certificate matching will hit this */
if( slap_ad_is_binary( ad ) && usage != SLAP_MR_EQUALITY ) {
*text = "inappropriate binary matching";
return LDAP_INAPPROPRIATE_MATCHING;
}
} else {
- *out = ber_bvdup( in );
+ ber_dupbv( out, in );
}
return LDAP_SUCCESS;
}
-#else
-void
-value_normalize(
- char *s,
- int syntax
-)
-{
- char *d, *save;
-
- if ( ! (syntax & SYNTAX_CIS) ) {
- return;
- }
- if ( syntax & SYNTAX_DN ) {
- (void) dn_normalize( s );
- return;
- }
-
- save = s;
- for ( d = s; *s; s++ ) {
- if ( (syntax & SYNTAX_TEL) && (*s == ' ' || *s == '-') ) {
- continue;
- }
- *d++ = TOUPPER( (unsigned char) *s );
- }
- *d = '\0';
-}
-#endif
-
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
int
value_match(
int *match,
AttributeDescription *ad,
MatchingRule *mr,
+ unsigned flags,
struct berval *v1, /* stored value */
void *v2, /* assertion */
const char ** text )
{
int rc;
- int usage = 0;
- struct berval *nv1 = NULL;
+ struct berval nv1 = { 0, NULL };
+ struct berval nv2 = { 0, NULL };
if( !mr->smr_match ) {
return LDAP_INAPPROPRIATE_MATCHING;
}
}
- rc = (mr->smr_match)( match, usage,
+ if ( SLAP_IS_MR_VALUE_SYNTAX_NONCONVERTED_MATCH( flags ) &&
+ mr->smr_convert )
+ {
+ rc = (mr->smr_convert)( v2, &nv2 );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ /* let smr_match know we've converted the value */
+ flags |= SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH;
+ }
+
+ rc = (mr->smr_match)( match, flags,
ad->ad_type->sat_syntax,
mr,
- nv1 != NULL ? nv1 : v1,
- v2 );
+ nv1.bv_val != NULL ? &nv1 : v1,
+ nv2.bv_val != NULL ? &nv2 : v2 );
- ber_bvfree( nv1 );
+ if (nv1.bv_val ) free( nv1.bv_val );
+ if (nv2.bv_val ) free( nv2.bv_val );
return rc;
}
-#else
-int
-value_cmp(
- struct berval *v1,
- struct berval *v2,
- int syntax,
- int normalize /* 1 => arg 1; 2 => arg 2; 3 => both */
-)
-{
- int rc;
-
- 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;
-
- 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 );
- }
-
- return( rc );
-}
-#endif
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-int value_find(
+int value_find_ex(
AttributeDescription *ad,
- struct berval **vals,
+ unsigned flags,
+ BerVarray vals,
struct berval *val )
-#else
-int
-value_find(
- struct berval **vals,
- struct berval *v,
- int syntax,
- int normalize )
-#endif
{
int i;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
int rc;
- struct berval *nval = NULL;
+ struct berval nval = { 0, NULL };
+ struct berval nval_tmp;
MatchingRule *mr = ad->ad_type->sat_equality;
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( mr->smr_syntax->ssyn_normalize ) {
rc = mr->smr_syntax->ssyn_normalize(
- mr->smr_syntax, val, &nval );
+ 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;
}
}
-#endif
- for ( i = 0; vals[i] != NULL; i++ ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ for ( i = 0; vals[i].bv_val != NULL; i++ ) {
int match;
const char *text;
- rc = value_match( &match, ad, mr, vals[i],
- nval == NULL ? val : nval, &text );
+ rc = value_match( &match, ad, mr, flags,
+ &vals[i], nval.bv_val == NULL ? val : &nval, &text );
- if( rc == LDAP_SUCCESS && match == 0 )
-#else
- if ( value_cmp( vals[i], v, syntax, normalize ) == 0 )
-#endif
- {
+ if( rc == LDAP_SUCCESS && match == 0 ) {
+ free( nval.bv_val );
return LDAP_SUCCESS;
}
}
+ free( nval.bv_val );
return LDAP_NO_SUCH_ATTRIBUTE;
}
projects / openldap / blobdiff