/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
memfree = op->o_tmpfree;
}
-#ifdef LDAP_COMP_MATCH
- /* Component Matching */
- if( mra->cf &&
- mra->ma_rule->smr_usage & (SLAP_MR_COMPONENT) ){
- return test_comp_filter_entry( op, e, mra );
- }
-#endif
if ( mra->ma_desc ) {
/*
* if ma_desc is available, then we're filtering for
}
if ( mra->ma_desc == slap_schema.si_ad_entryDN ) {
- struct berval *bv;
int ret, rc;
const char *text;
- if( mra->ma_rule == a->a_desc->ad_type->sat_equality ) {
- bv = &e->e_nname;
- } else {
- bv = &e->e_name;
- }
-
- rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
- bv, &mra->ma_value, &text );
+ rc = value_match( &ret, slap_schema.si_ad_entryDN, mra->ma_rule,
+ 0, &e->e_nname, &mra->ma_value, &text );
+
if( rc != LDAP_SUCCESS ) return rc;
if ( ret == 0 ) return LDAP_COMPARE_TRUE;
a = attrs_find( a->a_next, mra->ma_desc ) )
{
struct berval *bv;
+#ifdef LDAP_COMP_MATCH
+ /* Component Matching */
+ if( mra->ma_cf &&
+ mra->ma_rule->smr_usage & SLAP_MR_COMPONENT )
+ {
+ int ret;
+ int rc;
+ const char *text;
+
+ rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+ (struct berval *)a,(void*) mra , &text );
+ if ( rc != LDAP_SUCCESS ) return rc;
+ if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+ else return LDAP_COMPARE_FALSE;
+ }
+#endif
+
/* If ma_rule is not the same as the attribute's
* normal rule, then we can't use the a_nvals.
*/
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
bv, &mra->ma_value, &text );
-
+
if( rc != LDAP_SUCCESS ) return rc;
if ( ret == 0 ) return LDAP_COMPARE_TRUE;
}
memfree( value.bv_val, memctx );
continue;
}
+#ifdef LDAP_COMP_MATCH
+ /* Component Matching */
+ if( mra->ma_cf &&
+ mra->ma_rule->smr_usage & SLAP_MR_COMPONENT)
+ {
+ int ret;
+
+ rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+ (struct berval*)a, (void*)mra, &text );
+ if( rc != LDAP_SUCCESS ) break;
+
+ if ( ret == 0 ) {
+ rc = LDAP_COMPARE_TRUE;
+ break;
+ }
+
+ }
+#endif
/* check match */
if (mra->ma_rule == a->a_desc->ad_type->sat_equality) {
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
bv, &value, &text );
-
+
if( rc != LDAP_SUCCESS ) break;
if ( ret == 0 ) {
/* check match */
rc = value_match( &ret, ad, mra->ma_rule, 0,
bv, &value, &text );
-
if ( value.bv_val != mra->ma_value.bv_val ) {
memfree( value.bv_val, memctx );
}
AttributeAssertion *ava,
int type )
{
+ int rc;
Attribute *a;
if ( !access_allowed( op, e,
type != LDAP_FILTER_APPROX )
{
/* No other match is allowed */
- return LDAP_OTHER;
+ return LDAP_INAPPROPRIATE_MATCHING;
}
if ( op->o_bd->be_has_subordinates( op, e, &hasSubordinates ) !=
if ( ava->aa_desc == slap_schema.si_ad_entryDN ) {
MatchingRule *mr;
- int rc, ret;
+ int rc, match;
const char *text;
if( type != LDAP_FILTER_EQUALITY &&
type != LDAP_FILTER_APPROX )
{
/* No other match is allowed */
- return LDAP_OTHER;
+ return LDAP_INAPPROPRIATE_MATCHING;
}
- mr = a->a_desc->ad_type->sat_equality;
+ mr = slap_schema.si_ad_entryDN->ad_type->sat_equality;
assert( mr );
- rc = value_match( &ret, a->a_desc, mr, 0,
+ rc = value_match( &match, slap_schema.si_ad_entryDN, mr, 0,
&e->e_nname, &ava->aa_value, &text );
if( rc != LDAP_SUCCESS ) return rc;
- if( ret == 0 ) return LDAP_COMPARE_TRUE;
+ if( match == 0 ) return LDAP_COMPARE_TRUE;
return LDAP_COMPARE_FALSE;
}
+ rc = LDAP_COMPARE_FALSE;
+
for(a = attrs_find( e->e_attrs, ava->aa_desc );
a != NULL;
a = attrs_find( a->a_next, ava->aa_desc ) )
MatchingRule *mr;
struct berval *bv;
+ if (( ava->aa_desc != a->a_desc ) && !access_allowed( op,
+ e, a->a_desc, &ava->aa_value, ACL_SEARCH, NULL ))
+ {
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ continue;
+ }
+
switch ( type ) {
case LDAP_FILTER_APPROX:
mr = a->a_desc->ad_type->sat_approx;
mr = NULL;
}
- if( mr == NULL ) continue;
+ if( mr == NULL ) {
+ rc = LDAP_INAPPROPRIATE_MATCHING;
+ continue;
+ }
for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
- int ret;
- int rc;
+ int ret, match;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
+ ret = value_match( &match, a->a_desc, mr, 0,
bv, &ava->aa_value, &text );
- if( rc != LDAP_SUCCESS ) return rc;
+ if( ret != LDAP_SUCCESS ) {
+ rc = ret;
+ break;
+ }
switch ( type ) {
case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_APPROX:
- if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+ if ( match == 0 ) return LDAP_COMPARE_TRUE;
break;
case LDAP_FILTER_GE:
- if ( ret >= 0 ) return LDAP_COMPARE_TRUE;
+ if ( match >= 0 ) return LDAP_COMPARE_TRUE;
break;
case LDAP_FILTER_LE:
- if ( ret <= 0 ) return LDAP_COMPARE_TRUE;
+ if ( match <= 0 ) return LDAP_COMPARE_TRUE;
break;
}
}
}
- return LDAP_COMPARE_FALSE;
+ return rc;
}
AttributeDescription *desc )
{
Attribute *a;
+ int rc;
if ( !access_allowed( op, e, desc, NULL, ACL_SEARCH, NULL ) ) {
return LDAP_INSUFFICIENT_ACCESS;
}
if ( desc == slap_schema.si_ad_hasSubordinates ) {
-
/*
* XXX: fairly optimistic: if the function is defined,
* then PRESENCE must succeed, because hasSubordinate
return LDAP_COMPARE_TRUE;
}
- a = attrs_find( e->e_attrs, desc );
- return a != NULL ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
+ rc = LDAP_COMPARE_FALSE;
+
+ for(a = attrs_find( e->e_attrs, desc );
+ a != NULL;
+ a = attrs_find( a->a_next, desc ) )
+ {
+ if (( desc != a->a_desc ) && !access_allowed( op,
+ e, a->a_desc, NULL, ACL_SEARCH, NULL ))
+ {
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ continue;
+ }
+
+ rc = LDAP_COMPARE_TRUE;
+ break;
+ }
+
+ return rc;
}
Filter *f )
{
Attribute *a;
+ int rc;
Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
return LDAP_INSUFFICIENT_ACCESS;
}
+ rc = LDAP_COMPARE_FALSE;
+
for(a = attrs_find( e->e_attrs, f->f_sub_desc );
a != NULL;
a = attrs_find( a->a_next, f->f_sub_desc ) )
{
- MatchingRule *mr = a->a_desc->ad_type->sat_substr;
+ MatchingRule *mr;
struct berval *bv;
- if( mr == NULL ) continue;
+ if (( f->f_sub_desc != a->a_desc ) && !access_allowed( op,
+ e, a->a_desc, NULL, ACL_SEARCH, NULL ))
+ {
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ continue;
+ }
+
+ mr = a->a_desc->ad_type->sat_substr;
+ if( mr == NULL ) {
+ rc = LDAP_INAPPROPRIATE_MATCHING;
+ continue;
+ }
for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
- int ret;
- int rc;
+ int ret, match;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
+ ret = value_match( &match, a->a_desc, mr, 0,
bv, f->f_sub, &text );
- if( rc != LDAP_SUCCESS ) return rc;
- if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+ if( ret != LDAP_SUCCESS ) {
+ rc = ret;
+ break;
+ }
+ if ( match == 0 ) return LDAP_COMPARE_TRUE;
}
}
- Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n",
- 0, 0, 0 );
- return LDAP_COMPARE_FALSE;
+ Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter %d\n",
+ rc, 0, 0 );
+ return rc;
}