/* filterentry.c - apply a filter to an entry */
/* $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
*/
rc = test_filter( be, conn, op, e, f->f_not );
+ /* Flip true to false and false to true
+ * but leave Undefined alone.
+ */
switch( rc ) {
case LDAP_COMPARE_TRUE:
rc = LDAP_COMPARE_FALSE;
}
break;
-#ifdef SLAPD_EXT_FILTERS
case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
rc = test_mra_filter( be, conn, op, e, f->f_mra );
break;
-#endif
default:
#ifdef NEW_LOGGING
return( rc );
}
+static int test_mra_filter(
+ Backend *be,
+ Connection *conn,
+ Operation *op,
+ Entry *e,
+ MatchingRuleAssertion *mra )
+{
+ Attribute *a;
+
+ if( !access_allowed( be, conn, op, e,
+ mra->ma_desc, &mra->ma_value, ACL_SEARCH, NULL ) )
+ {
+ return LDAP_INSUFFICIENT_ACCESS;
+ }
+
+ for(a = attrs_find( e->e_attrs, mra->ma_desc );
+ a != NULL;
+ a = attrs_find( a->a_next, mra->ma_desc ) )
+ {
+ struct berval *bv;
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+ int ret;
+ int rc;
+ const char *text;
+
+ rc = value_match( &ret, a->a_desc, mra->ma_rule,
+ SLAP_MR_ASSERTION_SYNTAX_MATCH,
+ bv, &mra->ma_value,
+ &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( ret == 0 ) {
+ return LDAP_COMPARE_TRUE;
+ }
+ }
+ }
+
+ return LDAP_COMPARE_FALSE;
+}
static int
test_ava_filter(
int type
)
{
- int i;
Attribute *a;
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- ava->aa_desc, ava->aa_value, ACL_SEARCH ) )
+ if ( !access_allowed( be, conn, op, e,
+ ava->aa_desc, &ava->aa_value, ACL_SEARCH, NULL ) )
{
return LDAP_INSUFFICIENT_ACCESS;
}
a = attrs_find( a->a_next, ava->aa_desc ) )
{
MatchingRule *mr;
+ struct berval *bv;
switch ( type ) {
case LDAP_FILTER_APPROX:
continue;
}
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
int ret;
int rc;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
- a->a_vals[i], ava->aa_value,
- &text );
+ rc = value_match( &ret, a->a_desc, mr,
+ SLAP_MR_ASSERTION_SYNTAX_MATCH,
+ bv, &ava->aa_value, &text );
if( rc != LDAP_SUCCESS ) {
return rc;
AttributeDescription *desc
)
{
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- desc, NULL, ACL_SEARCH ) )
+ if ( !access_allowed( be, conn, op, e, desc, NULL, ACL_SEARCH, NULL ) )
{
return LDAP_INSUFFICIENT_ACCESS;
}
)
{
Filter *f;
- int rtn = LDAP_COMPARE_TRUE;
+ int rtn = LDAP_COMPARE_TRUE; /* True if empty */
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
int rc = test_filter( be, conn, op, e, f );
if ( rc == LDAP_COMPARE_FALSE ) {
- rtn = LDAP_COMPARE_FALSE;
+ /* filter is False */
+ rtn = rc;
break;
}
+
if ( rc != LDAP_COMPARE_TRUE ) {
+ /* filter is Undefined unless later elements are False */
rtn = rc;
}
}
)
{
Filter *f;
- int rtn = LDAP_COMPARE_FALSE;
+ int rtn = LDAP_COMPARE_FALSE; /* False if empty */
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
int rc = test_filter( be, conn, op, e, f );
if ( rc == LDAP_COMPARE_TRUE ) {
- rtn = LDAP_COMPARE_TRUE;
+ /* filter is True */
+ rtn = rc;
break;
}
- if ( rc != LDAP_COMPARE_TRUE ) {
+
+ if ( rc != LDAP_COMPARE_FALSE ) {
+ /* filter is Undefined unless later elements are True */
rtn = rc;
}
}
#endif
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- f->f_sub_desc, NULL, ACL_SEARCH ) )
+ if ( !access_allowed( be, conn, op, e,
+ f->f_sub_desc, NULL, ACL_SEARCH, NULL ) )
{
return LDAP_INSUFFICIENT_ACCESS;
}
a != NULL;
a = attrs_find( a->a_next, f->f_sub_desc ) )
{
- int i;
MatchingRule *mr = a->a_desc->ad_type->sat_substr;
+ struct berval *bv;
if( mr == NULL ) {
continue;
}
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
int ret;
int rc;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
- a->a_vals[i], f->f_sub,
- &text );
+ rc = value_match( &ret, a->a_desc, mr,
+ SLAP_MR_ASSERTION_SYNTAX_MATCH,
+ bv, f->f_sub, &text );
if( rc != LDAP_SUCCESS ) {
return rc;