/* value.c - routines for dealing with values */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
; /* NULL */
if ( *vals == NULL ) {
- *vals = (BerVarray) ch_malloc( (nn + 1)
+ *vals = (BerVarray) SLAP_MALLOC( (nn + 1)
* sizeof(struct berval) );
+ if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+ Debug(LDAP_DEBUG_TRACE,
+ "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+ return LBER_ERROR_MEMORY;
+ }
n = 0;
} else {
for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
; /* Empty */
}
- *vals = (BerVarray) ch_realloc( (char *) *vals,
+ *vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
(n + nn + 1) * sizeof(struct berval) );
+ if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+ Debug(LDAP_DEBUG_TRACE,
+ "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+ return LBER_ERROR_MEMORY;
+ }
}
v2 = *vals + n;
BerVarray v2;
if ( *vals == NULL ) {
- *vals = (BerVarray) ch_malloc( 2 * sizeof(struct berval) );
+ *vals = (BerVarray) SLAP_MALLOC( 2 * sizeof(struct berval) );
+ if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+ Debug(LDAP_DEBUG_TRACE,
+ "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+ return LBER_ERROR_MEMORY;
+ }
n = 0;
} else {
for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
; /* Empty */
}
- *vals = (BerVarray) ch_realloc( (char *) *vals,
+ *vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
(n + 2) * sizeof(struct berval) );
+ if( *vals == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#else
+ Debug(LDAP_DEBUG_TRACE,
+ "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
+#endif
+ return LBER_ERROR_MEMORY;
+ }
}
v2 = *vals + n;
return LDAP_SUCCESS;
}
+#ifdef SLAP_NVALUES
+int asserted_value_validate_normalize(
+ AttributeDescription *ad,
+ MatchingRule *mr,
+ unsigned usage,
+ struct berval *in,
+ struct berval *out,
+ const char ** text )
+{
+ int rc;
+
+ /* we expect the value to be in the assertion syntax */
+ assert( !SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX(usage) );
+
+ if( mr == NULL ) {
+ *text = "inappropriate matching request";
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ if( !mr->smr_match ) {
+ *text = "requested matching rule not supported";
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ rc = (mr->smr_syntax->ssyn_validate)( mr->smr_syntax, in );
+
+ if( rc != LDAP_SUCCESS ) {
+ *text = "value does not conform to assertion syntax";
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ if( mr->smr_normalize ) {
+ rc = (mr->smr_normalize)( usage,
+ ad ? ad->ad_type->sat_syntax : NULL,
+ mr, in, out );
+
+ if( rc != LDAP_SUCCESS ) {
+ *text = "unable to normalize value for matching";
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ } else {
+ ber_dupbv( out, in );
+ }
+}
+
+#else
int
value_validate(
MatchingRule *mr,
const char **text )
{
int rc;
- MatchingRule *mr;
-
- 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;
- }
+ MatchingRule *mr = ad_mr( ad, usage );
if( mr == NULL ) {
*text = "inappropriate matching request";
const char **text )
{
int rc;
- MatchingRule *mr;
-
- 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;
- }
+ MatchingRule *mr = ad_mr( ad, usage );
if( mr == NULL ) {
*text = "inappropriate matching request";
return LDAP_SUCCESS;
}
-
+#endif
int
value_match(
struct berval nv1 = { 0, NULL };
struct berval nv2 = { 0, NULL };
+ assert( mr != NULL );
+
if( !mr->smr_match ) {
return LDAP_INAPPROPRIATE_MATCHING;
}
+#ifndef SLAP_NVALUES
if( ad->ad_type->sat_syntax->ssyn_normalize ) {
rc = ad->ad_type->sat_syntax->ssyn_normalize(
ad->ad_type->sat_syntax, v1, &nv1 );
}
}
- if ( SLAP_IS_MR_VALUE_SYNTAX_NONCONVERTED_MATCH( flags ) &&
+ if ( SLAP_IS_MR_ATTRIBUTE_SYNTAX_NONCONVERTED_MATCH( flags ) &&
mr->smr_convert )
{
rc = (mr->smr_convert)( v2, &nv2 );
}
/* let smr_match know we've converted the value */
- flags |= SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH;
+ flags |= SLAP_MR_ATTRIBUTE_SYNTAX_CONVERTED_MATCH;
}
+#endif
rc = (mr->smr_match)( match, flags,
ad->ad_type->sat_syntax,
return rc;
}
-
int value_find_ex(
AttributeDescription *ad,
unsigned flags,
return LDAP_INAPPROPRIATE_MATCHING;
}
+#ifdef SLAP_NVALUES
+ assert(SLAP_IS_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH( flags ));
+
+ if( !SLAP_IS_MR_ASSERTED_VALUE_NORMALIZED_MATCH( flags ) &&
+ mr->smr_normalize )
+ {
+ rc = (mr->smr_normalize)(
+ flags & SLAP_MR_TYPE_MASK|SLAP_MR_SUBTYPE_MASK,
+ ad ? ad->ad_type->sat_syntax : NULL,
+ mr, val, &nval );
+
+ if( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+#else
+
/* Take care of this here or ssyn_normalize later will hurt */
- if ( SLAP_IS_MR_VALUE_SYNTAX_NONCONVERTED_MATCH( flags )
+ if ( SLAP_IS_MR_ATTRIBUTE_SYNTAX_NONCONVERTED_MATCH( flags )
&& mr->smr_convert )
{
rc = (mr->smr_convert)( val, &nval );
}
/* let value_match know we've done the version */
- flags |= SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH;
+ flags |= SLAP_MR_ATTRIBUTE_SYNTAX_CONVERTED_MATCH;
}
- if( mr->smr_syntax->ssyn_normalize ) {
- struct berval nval_tmp;
+ if( !(flags & SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH) &&
+ mr->smr_syntax->ssyn_normalize )
+ {
+ struct berval nval_tmp = { 0, NULL };
rc = mr->smr_syntax->ssyn_normalize(
mr->smr_syntax,
return LDAP_INAPPROPRIATE_MATCHING;
}
}
+#endif
for ( i = 0; vals[i].bv_val != NULL; i++ ) {
int match;
projects / openldap / blobdiff