mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
SLAP_NVALUES updates
This commit is contained in:
Kurt Zeilenga
parent
676349481f
commit
e1980876f4
@ -36,6 +36,9 @@ static int get_simple_vrFilter(
|
||||
ValuesReturnFilter **f,
|
||||
const char **text );
|
||||
|
||||
#ifdef SLAP_NVALUES
|
||||
#define XXX 1
|
||||
#endif
|
||||
|
||||
int
|
||||
get_filter(
|
||||
@ -210,7 +213,7 @@ get_filter(
|
||||
if ( err != LDAP_SUCCESS ) {
|
||||
break;
|
||||
}
|
||||
#if XXX
|
||||
#ifdef XXX
|
||||
assert( f->f_and != NULL );
|
||||
#endif
|
||||
break;
|
||||
@ -226,9 +229,6 @@ get_filter(
|
||||
if ( err != LDAP_SUCCESS ) {
|
||||
break;
|
||||
}
|
||||
#if XXX
|
||||
assert( f->f_or != NULL );
|
||||
#endif
|
||||
break;
|
||||
|
||||
case LDAP_FILTER_NOT:
|
||||
@ -243,9 +243,6 @@ get_filter(
|
||||
if ( err != LDAP_SUCCESS ) {
|
||||
break;
|
||||
}
|
||||
#if XXX
|
||||
assert( f->f_not != NULL );
|
||||
#endif
|
||||
break;
|
||||
|
||||
case LDAP_FILTER_EXT:
|
||||
@ -261,7 +258,7 @@ get_filter(
|
||||
break;
|
||||
}
|
||||
|
||||
#if nothosed
|
||||
#ifdef XXX
|
||||
assert( f->f_mra != NULL );
|
||||
#endif
|
||||
break;
|
||||
@ -324,7 +321,8 @@ get_filter_list( Connection *conn, BerElement *ber,
|
||||
Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
|
||||
#endif
|
||||
new = f;
|
||||
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
|
||||
for ( tag = ber_first_element( ber, &len, &last );
|
||||
tag != LBER_DEFAULT;
|
||||
tag = ber_next_element( ber, &len, last ) )
|
||||
{
|
||||
err = get_filter( conn, ber, new, text );
|
||||
|
||||
@ -36,19 +36,13 @@ get_mra(
|
||||
int rc;
|
||||
ber_tag_t tag, rtag;
|
||||
ber_len_t length;
|
||||
struct berval type = { 0, NULL }, value;
|
||||
MatchingRuleAssertion *ma;
|
||||
struct berval type = { 0, NULL };
|
||||
struct berval value = { 0, NULL };
|
||||
MatchingRuleAssertion ma;
|
||||
|
||||
ma = ch_malloc( sizeof( MatchingRuleAssertion ) );
|
||||
ma->ma_rule = NULL;
|
||||
ma->ma_rule_text.bv_len = 0;
|
||||
ma->ma_rule_text.bv_val = NULL;
|
||||
ma->ma_desc = NULL;
|
||||
ma->ma_dnattrs = 0;
|
||||
ma->ma_value.bv_len = 0;
|
||||
ma->ma_value.bv_val = NULL;
|
||||
memset( &ma, 0, sizeof ma);
|
||||
|
||||
rtag = ber_scanf( ber, "{t", &tag );
|
||||
rtag = ber_scanf( ber, "{t" /*"}"*/, &tag );
|
||||
|
||||
if( rtag == LBER_ERROR ) {
|
||||
#ifdef NEW_LOGGING
|
||||
@ -59,12 +53,11 @@ get_mra(
|
||||
#endif
|
||||
|
||||
*text = "Error parsing matching rule assertion";
|
||||
mra_free( ma, 1 );
|
||||
return SLAPD_DISCONNECT;
|
||||
}
|
||||
|
||||
if ( tag == LDAP_FILTER_EXT_OID ) {
|
||||
rtag = ber_scanf( ber, "m", &ma->ma_rule_text );
|
||||
rtag = ber_scanf( ber, "m", &ma.ma_rule_text );
|
||||
if ( rtag == LBER_ERROR ) {
|
||||
#ifdef NEW_LOGGING
|
||||
LDAP_LOG( OPERATION, ERR,
|
||||
@ -74,7 +67,6 @@ get_mra(
|
||||
#endif
|
||||
|
||||
*text = "Error parsing matching rule in matching rule assertion";
|
||||
mra_free( ma, 1 );
|
||||
return SLAPD_DISCONNECT;
|
||||
}
|
||||
|
||||
@ -88,7 +80,6 @@ get_mra(
|
||||
#endif
|
||||
|
||||
*text = "Error parsing matching rule assertion";
|
||||
mra_free( ma, 1 );
|
||||
return SLAPD_DISCONNECT;
|
||||
}
|
||||
}
|
||||
@ -117,7 +108,6 @@ get_mra(
|
||||
#endif
|
||||
|
||||
*text = "Error parsing matching rule assertion";
|
||||
mra_free( ma, 1 );
|
||||
return SLAPD_DISCONNECT;
|
||||
}
|
||||
}
|
||||
@ -131,7 +121,6 @@ get_mra(
|
||||
#endif
|
||||
|
||||
*text = "Missing value in matching rule assertion";
|
||||
mra_free( ma, 1 );
|
||||
return SLAPD_DISCONNECT;
|
||||
}
|
||||
|
||||
@ -146,16 +135,15 @@ get_mra(
|
||||
#endif
|
||||
|
||||
*text = "Error decoding value in matching rule assertion";
|
||||
mra_free( ma, 1 );
|
||||
return SLAPD_DISCONNECT;
|
||||
}
|
||||
|
||||
tag = ber_peek_tag( ber, &length );
|
||||
|
||||
if ( tag == LDAP_FILTER_EXT_DNATTRS ) {
|
||||
rtag = ber_scanf( ber, "b}", &ma->ma_dnattrs );
|
||||
rtag = ber_scanf( ber, /*"{"*/ "b}", &ma.ma_dnattrs );
|
||||
} else {
|
||||
rtag = ber_scanf( ber, "}" );
|
||||
rtag = ber_scanf( ber, /*"{"*/ "}" );
|
||||
}
|
||||
|
||||
if( rtag == LBER_ERROR ) {
|
||||
@ -166,54 +154,48 @@ get_mra(
|
||||
#endif
|
||||
|
||||
*text = "Error decoding dnattrs matching rule assertion";
|
||||
mra_free( ma, 1 );
|
||||
return SLAPD_DISCONNECT;
|
||||
}
|
||||
|
||||
if( type.bv_val != NULL ) {
|
||||
rc = slap_bv2ad( &type, &ma->ma_desc, text );
|
||||
rc = slap_bv2ad( &type, &ma.ma_desc, text );
|
||||
if( rc != LDAP_SUCCESS ) {
|
||||
mra_free( ma, 1 );
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
|
||||
if( ma->ma_rule_text.bv_val != NULL ) {
|
||||
ma->ma_rule = mr_bvfind( &ma->ma_rule_text );
|
||||
if( ma->ma_rule == NULL ) {
|
||||
mra_free( ma, 1 );
|
||||
if( ma.ma_rule_text.bv_val != NULL ) {
|
||||
ma.ma_rule = mr_bvfind( &ma.ma_rule_text );
|
||||
if( ma.ma_rule == NULL ) {
|
||||
*text = "matching rule not recognized";
|
||||
return LDAP_INAPPROPRIATE_MATCHING;
|
||||
}
|
||||
}
|
||||
|
||||
if ( ma->ma_rule == NULL ) {
|
||||
if ( ma.ma_rule == NULL ) {
|
||||
/*
|
||||
* Need either type or rule ...
|
||||
*/
|
||||
if ( ma->ma_desc == NULL ) {
|
||||
mra_free( ma, 1 );
|
||||
if ( ma.ma_desc == NULL ) {
|
||||
*text = "no matching rule or type";
|
||||
return LDAP_INAPPROPRIATE_MATCHING;
|
||||
}
|
||||
|
||||
if ( ma->ma_desc->ad_type->sat_equality != NULL &&
|
||||
ma->ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
|
||||
if ( ma.ma_desc->ad_type->sat_equality != NULL &&
|
||||
ma.ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
|
||||
{
|
||||
/* no matching rule was provided, use the attribute's
|
||||
equality rule if it supports extensible matching. */
|
||||
ma->ma_rule = ma->ma_desc->ad_type->sat_equality;
|
||||
ma.ma_rule = ma.ma_desc->ad_type->sat_equality;
|
||||
|
||||
} else {
|
||||
*text = "no appropriate rule to use for type";
|
||||
mra_free( ma, 1 );
|
||||
return LDAP_INAPPROPRIATE_MATCHING;
|
||||
}
|
||||
}
|
||||
|
||||
if ( ma->ma_desc != NULL ) {
|
||||
if( !mr_usable_with_at( ma->ma_rule, ma->ma_desc->ad_type ) ) {
|
||||
mra_free( ma, 1 );
|
||||
if ( ma.ma_desc != NULL ) {
|
||||
if( !mr_usable_with_at( ma.ma_rule, ma.ma_desc->ad_type ) ) {
|
||||
*text = "matching rule use with this attribute not appropriate";
|
||||
return LDAP_INAPPROPRIATE_MATCHING;
|
||||
}
|
||||
@ -223,15 +205,15 @@ get_mra(
|
||||
* OK, if no matching rule, normalize for equality, otherwise
|
||||
* normalize for the matching rule.
|
||||
*/
|
||||
rc = value_validate_normalize( ma->ma_desc, SLAP_MR_EQUALITY,
|
||||
&value, &ma->ma_value, text );
|
||||
rc = value_validate_normalize( ma.ma_desc, SLAP_MR_EQUALITY,
|
||||
&value, &ma.ma_value, text );
|
||||
} else {
|
||||
/*
|
||||
* Need to normalize, but how?
|
||||
*/
|
||||
rc = value_validate( ma->ma_rule, &value, text );
|
||||
rc = value_validate( ma.ma_rule, &value, text );
|
||||
if ( rc == LDAP_SUCCESS ) {
|
||||
ber_dupbv( &ma->ma_value, &value );
|
||||
ber_dupbv( &ma.ma_value, &value );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -240,22 +222,23 @@ get_mra(
|
||||
/*
|
||||
* Normalize per matching rule
|
||||
*/
|
||||
rc = asserted_value_validate_normalize( ma->ma_desc,
|
||||
ma->ma_rule,
|
||||
rc = asserted_value_validate_normalize( ma.ma_desc,
|
||||
ma.ma_rule,
|
||||
SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
|
||||
&ma->ma_value, &value, text );
|
||||
&ma.ma_value, &value, text );
|
||||
if ( rc == LDAP_SUCCESS ) {
|
||||
ber_dupbv( &ma->ma_value, &value );
|
||||
ma.ma_value = value;
|
||||
} else
|
||||
#else
|
||||
if( rc != LDAP_SUCCESS )
|
||||
#endif
|
||||
{
|
||||
mra_free( ma, 1 );
|
||||
return rc;
|
||||
}
|
||||
|
||||
*mra = ma;
|
||||
*mra = ch_malloc( sizeof ma );
|
||||
**mra = ma;
|
||||
|
||||
return LDAP_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user