/* filterentry.c - apply a filter to an entry */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
* test_filter - test a filter against a single entry.
* returns:
- * LDAP_COMPARE_TRUE filter matched
- * LDAP_COMPARE_FALSE filter did not match
- * or an ldap error code
+ * LDAP_COMPARE_TRUE filter matched
+ * LDAP_COMPARE_FALSE filter did not match
+ * SLAPD_COMPARE_UNDEFINED filter is undefined
+ * or an ldap result code indicating error
*/
int
Debug( LDAP_DEBUG_FILTER, "=> test_filter\n", 0, 0, 0 );
switch ( f->f_choice ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ case SLAPD_FILTER_COMPUTED:
+ Debug( LDAP_DEBUG_FILTER, " COMPUTED %s (%d)\n",
+ f->f_result == LDAP_COMPARE_FALSE ? "false" :
+ f->f_result == LDAP_COMPARE_TRUE ? "true" :
+ f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" : "error",
+ f->f_result, 0 );
+ rc = f->f_result;
+ break;
+#endif
+
case LDAP_FILTER_EQUALITY:
Debug( LDAP_DEBUG_FILTER, " EQUALITY\n", 0, 0, 0 );
#ifdef SLAPD_SCHEMA_NOT_COMPAT
#if SLAPD_SCHEMA_NOT_COMPAT
rc = test_mra_filter( be, conn, op, e, f->f_mra );
#else
- rc = -1;
+ rc = LDAP_UNWILLING_TO_PERFORM;
#endif
break;
#endif
- case 0:
- Debug( LDAP_DEBUG_FILTER, " UNDEFINED\n", 0, 0, 0 );
- rc = -1;
- break;
-
default:
Debug( LDAP_DEBUG_ANY, " unknown filter type %lu\n",
f->f_choice, 0, 0 );
- rc = -1;
+ rc = LDAP_PROTOCOL_ERROR;
}
Debug( LDAP_DEBUG_FILTER, "<= test_filter %d\n", rc, 0, 0 );
ava->ava_type, &ava->ava_value, ACL_SEARCH ) )
#endif
{
- return( -2 );
+ return LDAP_INSUFFICIENT_ACCESS;
}
#ifdef SLAPD_SCHEMA_NOT_COMPAT
for(a = attrs_find( e->e_attrs, ava->aa_desc );
a != NULL;
- a = attrs_find( a, ava->aa_desc ) )
+ a = attrs_find( a->a_next, ava->aa_desc ) )
#else
a = attr_find( e->e_attrs, ava->ava_type );
if ( a != NULL )
#endif
{
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ MatchingRule *mr;
+
+ switch ( type ) {
+ case LDAP_FILTER_EQUALITY:
+ case LDAP_FILTER_APPROX:
+ mr = a->a_desc->ad_type->sat_equality;
+ break;
+
+ case LDAP_FILTER_GE:
+ case LDAP_FILTER_LE:
+ mr = a->a_desc->ad_type->sat_ordering;
+ break;
+
+ default:
+ mr = NULL;
+ }
+
+ if( mr == NULL ) {
+ continue;
+ }
+#else
if ( a->a_syntax == 0 ) {
a->a_syntax = attr_syntax( ava->ava_type );
}
#endif
for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ int ret;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
int rc;
+ const char *text;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
- rc = 0;
+ rc = value_match( &ret, a->a_desc, mr,
+ a->a_vals[i], ava->aa_value,
+ &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
#else
- rc = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax,
+ ret = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax,
3 );
#endif
switch ( type ) {
case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_APPROX:
- if ( rc == 0 ) {
+ if ( ret == 0 ) {
return LDAP_COMPARE_TRUE;
}
break;
case LDAP_FILTER_GE:
- if ( rc >= 0 ) {
+ if ( ret >= 0 ) {
return LDAP_COMPARE_TRUE;
}
break;
case LDAP_FILTER_LE:
- if ( rc <= 0 ) {
+ if ( ret <= 0 ) {
return LDAP_COMPARE_TRUE;
}
break;
#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc
#else
- char *desc
+ char *desc
#endif
)
{
if ( be != NULL && ! access_allowed( be, conn, op, e,
desc, NULL, ACL_SEARCH ) )
{
- return( -2 );
+ return LDAP_INSUFFICIENT_ACCESS;
}
#ifdef SLAPD_SCHEMA_NOT_COMPAT
if ( be != NULL && ! access_allowed( be, conn, op, e,
ava->ava_type, NULL, ACL_SEARCH ) )
{
- return( -2 );
+ return LDAP_INSUFFICIENT_ACCESS;
}
a = attr_find( e->e_attrs, ava->ava_type );
Filter *f
)
{
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
Attribute *a;
+#ifndef SLAPD_SCHEMA_NOT_COMPAT
int i, rc;
char *p, *end, *realval, *tmp;
char pat[BUFSIZ];
char buf[BUFSIZ];
struct berval *val;
regex_t re;
+#endif
Debug( LDAP_DEBUG_FILTER, "begin test_substring_filter\n", 0, 0, 0 );
if ( be != NULL && ! access_allowed( be, conn, op, e,
- f->f_sub_type, NULL, ACL_SEARCH ) )
+ f->f_sub_desc, NULL, ACL_SEARCH ) )
{
- return( -2 );
+ return LDAP_INSUFFICIENT_ACCESS;
}
- if ( (a = attr_find( e->e_attrs, f->f_sub_type )) == NULL ) {
- return LDAP_COMPARE_FALSE;
- }
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ for(a = attrs_find( e->e_attrs, f->f_sub_desc );
+ a != NULL;
+ a = attrs_find( a->a_next, f->f_sub_desc ) )
+#else
+ a = attr_find( e->e_attrs, f->f_sub_type );
+ if ( a != NULL )
+#endif
+ {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ int i;
+ MatchingRule *mr = a->a_desc->ad_type->sat_substr;
+ if( mr == NULL ) {
+ continue;
+ }
+
+ for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ int ret;
+ int rc;
+ const char *text;
+
+ rc = value_match( &ret, a->a_desc, mr,
+ a->a_vals[i], f->f_sub,
+ &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( ret == 0 ) {
+ return LDAP_COMPARE_TRUE;
+ }
+ }
+#else
if ( a->a_syntax & SYNTAX_BIN ) {
Debug( LDAP_DEBUG_FILTER, "test_substring_filter bin attr\n",
0, 0, 0 );
- return( -1 );
+ return LDAP_INAPPROPRIATE_MATCHING;
}
/*
if ( p + 2 * f->f_sub_initial->bv_len > end ) {
Debug( LDAP_DEBUG_ANY, "not enough pattern space\n",
0, 0, 0 );
- return( -1 );
+ return LDAP_OTHER;
}
strcpy_regex( p, f->f_sub_initial->bv_val );
p = strchr( p, '\0' );
if ( p + 2 * f->f_sub_any[i]->bv_len + 2 > end ) {
Debug( LDAP_DEBUG_ANY,
"not enough pattern space\n", 0, 0, 0 );
- return( -1 );
+ return LDAP_OTHER;
}
strcpy( p, ".*" );
p = strchr( p, '\0' );
regerror(rc, &re, error, sizeof(error));
Debug( LDAP_DEBUG_ANY, "regcomp failed (%s) %s\n",
p, error, 0 );
- return( -1 );
+ return LDAP_OTHER;
}
/* for each value in the attribute see if regex matches */
regfree(&re);
#endif
+ }
Debug( LDAP_DEBUG_FILTER, "end test_substring_filter 1\n", 0, 0, 0 );
return LDAP_COMPARE_FALSE;
projects / openldap / blobdiff