From: Kurt Zeilenga Date: Fri, 1 Mar 2002 18:05:47 +0000 (+0000) Subject: Add normalize_validate_normalize() to be use instead of value_normalize() X-Git-Tag: OPENLDAP_REL_ENG_2_MP~387 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a71cd1518241584a19f12f357037908a09bd6b53;p=openldap Add normalize_validate_normalize() to be use instead of value_normalize() where value has not yet been validated. --- diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 0da0e1c321..444fbe4b5b 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -952,6 +952,12 @@ LDAP_SLAPD_F (int) value_normalize LDAP_P(( struct berval *in, struct berval *out, const char ** text )); +LDAP_SLAPD_F (int) value_validate_normalize LDAP_P(( + AttributeDescription *ad, + unsigned usage, + struct berval *in, + struct berval *out, + const char ** text )); LDAP_SLAPD_F (int) value_match LDAP_P(( int *match, AttributeDescription *ad, diff --git a/servers/slapd/value.c b/servers/slapd/value.c index 3391849236..002a105ab3 100644 --- a/servers/slapd/value.c +++ b/servers/slapd/value.c @@ -154,6 +154,91 @@ value_normalize( return LDAP_SUCCESS; } +int +value_validate_normalize( + AttributeDescription *ad, + unsigned usage, + struct berval *in, + struct berval *out, + 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; + } + + if( mr == NULL ) { + *text = "inappropriate matching request"; + return LDAP_INAPPROPRIATE_MATCHING; + } + + if( mr->smr_syntax == NULL ) { + *text = "no assertion syntax"; + return LDAP_INVALID_SYNTAX; + } + + if( ! mr->smr_syntax->ssyn_validate ) { + *text = "no syntax validator"; + return LDAP_INVALID_SYNTAX; + } + + rc = (mr->smr_syntax->ssyn_validate)( mr->smr_syntax, in ); + + if( rc != LDAP_SUCCESS ) { + *text = "value is invalid"; + return LDAP_INVALID_SYNTAX; + } + + /* 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; + } + + 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; + } + + } else { + ber_dupbv( out, in ); + } + + return LDAP_SUCCESS; +} + int value_match(