/* filterentry.c - apply a filter to an entry */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <ac/socket.h>
#include <ac/string.h>
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-#include <ac/regex.h>
-#endif
#include "slap.h"
static int test_filter_or( Backend *be,
Connection *conn, Operation *op,
Entry *e, Filter *flist );
-static int test_substring_filter( Backend *be,
+static int test_substrings_filter( Backend *be,
Connection *conn, Operation *op,
Entry *e, Filter *f);
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
static int test_ava_filter( Backend *be,
Connection *conn, Operation *op,
Entry *e, AttributeAssertion *ava, int type );
static int test_presence_filter( Backend *be,
Connection *conn, Operation *op,
Entry *e, AttributeDescription *desc );
-#else
-static int test_ava_filter(Backend *be,
- Connection *conn, Operation *op,
- Entry *e, Ava *ava, int type);
-static int test_approx_filter(Backend *be,
- Connection *conn, Operation *op,
- Entry *e, Ava *ava);
-static int test_presence_filter(Backend *be,
- Connection *conn, Operation *op,
- Entry *e, char *type);
-#endif
/*
{
int rc;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_filter: begin\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter\n", 0, 0, 0 );
+#endif
+
switch ( f->f_choice ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
case SLAPD_FILTER_COMPUTED:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_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 ));
+#else
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 );
+#endif
+
rc = f->f_result;
break;
-#endif
case LDAP_FILTER_EQUALITY:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter: EQUALITY\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, " EQUALITY\n", 0, 0, 0 );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+#endif
+
rc = test_ava_filter( be, conn, op, e, f->f_ava,
LDAP_FILTER_EQUALITY );
-#else
- rc = test_ava_filter( be, conn, op, e, &f->f_ava,
- LDAP_FILTER_EQUALITY );
-#endif
break;
case LDAP_FILTER_SUBSTRINGS:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter SUBSTRINGS\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, " SUBSTRINGS\n", 0, 0, 0 );
- rc = test_substring_filter( be, conn, op, e, f );
+#endif
+
+ rc = test_substrings_filter( be, conn, op, e, f );
break;
case LDAP_FILTER_GE:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
rc = test_ava_filter( be, conn, op, e, f->f_ava,
LDAP_FILTER_GE );
-#else
- Debug( LDAP_DEBUG_FILTER, " GE\n", 0, 0, 0 );
- rc = test_ava_filter( be, conn, op, e, &f->f_ava,
- LDAP_FILTER_GE );
-#endif
break;
case LDAP_FILTER_LE:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
rc = test_ava_filter( be, conn, op, e, f->f_ava,
LDAP_FILTER_LE );
-#else
- Debug( LDAP_DEBUG_FILTER, " LE\n", 0, 0, 0 );
- rc = test_ava_filter( be, conn, op, e, &f->f_ava,
- LDAP_FILTER_LE );
-#endif
break;
case LDAP_FILTER_PRESENT:
- Debug( LDAP_DEBUG_FILTER, " PRESENT\n", 0, 0, 0 );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = test_presence_filter( be, conn, op, e, f->f_desc );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter: PRESENT\n" ));
#else
- rc = test_presence_filter( be, conn, op, e, f->f_type );
+ Debug( LDAP_DEBUG_FILTER, " PRESENT\n", 0, 0, 0 );
#endif
+
+ rc = test_presence_filter( be, conn, op, e, f->f_desc );
break;
case LDAP_FILTER_APPROX:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter: APPROX\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, " APPROX\n", 0, 0, 0 );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+#endif
rc = test_ava_filter( be, conn, op, e, f->f_ava,
LDAP_FILTER_APPROX );
-#else
- rc = test_approx_filter( be, conn, op, e, &f->f_ava );
-#endif
break;
case LDAP_FILTER_AND:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter: AND\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, " AND\n", 0, 0, 0 );
+#endif
+
rc = test_filter_and( be, conn, op, e, f->f_and );
break;
case LDAP_FILTER_OR:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter: OR\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, " OR\n", 0, 0, 0 );
+#endif
+
rc = test_filter_or( be, conn, op, e, f->f_or );
break;
case LDAP_FILTER_NOT:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter: NOT\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, " NOT\n", 0, 0, 0 );
+#endif
+
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:
- Debug( LDAP_DEBUG_FILTER, " EXT\n", 0, 0, 0 );
-#if SLAPD_SCHEMA_NOT_COMPAT
- rc = test_mra_filter( be, conn, op, e, f->f_mra );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+ "test_filter: EXT\n" ));
#else
- rc = -1;
-#endif
- break;
+ Debug( LDAP_DEBUG_FILTER, " EXT\n", 0, 0, 0 );
#endif
- case 0:
- Debug( LDAP_DEBUG_FILTER, " UNDEFINED\n", 0, 0, 0 );
- rc = -1;
+ rc = test_mra_filter( be, conn, op, e, f->f_mra );
break;
default:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+ "test_filter: unknown filter type %lu\n",
+ f->f_choice ));
+#else
Debug( LDAP_DEBUG_ANY, " unknown filter type %lu\n",
f->f_choice, 0, 0 );
- rc = -1;
+#endif
+
+ rc = LDAP_PROTOCOL_ERROR;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_filter: return=%d\n", rc ));
+#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter %d\n", rc, 0, 0 );
+#endif
+
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 ) )
+ {
+ return LDAP_INSUFFICIENT_ACCESS;
+ }
+
+ if( strcmp(mra->ma_rule->smr_syntax->ssyn_oid,
+ mra->ma_desc->ad_type->sat_syntax->ssyn_oid) != 0)
+ {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ if( mra->ma_rule == NULL )
+ {
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ 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 ) {
+ return LDAP_COMPARE_TRUE;
+ }
+ }
+ }
+
+ return LDAP_COMPARE_FALSE;
+}
static int
test_ava_filter(
Connection *conn,
Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeAssertion *ava,
-#else
- Ava *ava,
-#endif
int type
)
{
- int i;
Attribute *a;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- ava->aa_desc, ava->aa_value, ACL_SEARCH ) )
-#else
-
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- ava->ava_type, &ava->ava_value, ACL_SEARCH ) )
-#endif
+ if ( !access_allowed( be, conn, op, e,
+ ava->aa_desc, &ava->aa_value, ACL_SEARCH ) )
{
- 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 ) )
-#else
- a = attr_find( e->e_attrs, ava->ava_type );
- if ( a != NULL )
-#endif
+ a = attrs_find( a->a_next, ava->aa_desc ) )
{
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
- if ( a->a_syntax == 0 ) {
- a->a_syntax = attr_syntax( ava->ava_type );
+ MatchingRule *mr;
+ struct berval *bv;
+
+ switch ( type ) {
+ case LDAP_FILTER_APPROX:
+ mr = a->a_desc->ad_type->sat_approx;
+ if( mr != NULL ) break;
+
+ /* use EQUALITY matching rule if no APPROX rule */
+
+ case LDAP_FILTER_EQUALITY:
+ 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;
}
-#endif
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ if( mr == NULL ) {
+ continue;
+ }
+
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+ int ret;
int rc;
+ const char *text;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
- rc = 0;
-#else
- rc = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax,
- 3 );
-#endif
+ rc = value_match( &ret, a->a_desc, mr,
+ SLAP_MR_ASSERTION_SYNTAX_MATCH,
+ bv, &ava->aa_value, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
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;
Connection *conn,
Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc
-#else
- char *desc
-#endif
)
{
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- desc, NULL, ACL_SEARCH ) )
+ if ( !access_allowed( be, conn, op, e, desc, NULL, ACL_SEARCH ) )
{
- return( -2 );
+ return LDAP_INSUFFICIENT_ACCESS;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
return attrs_find( e->e_attrs, desc ) != NULL
-#else
- return attr_find( e->e_attrs, desc ) != NULL
-#endif
? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
}
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-static int
-test_approx_filter(
- Backend *be,
- Connection *conn,
- Operation *op,
- Entry *e,
- Ava *ava
-)
-{
- char *w1, *w2, *c1, *c2;
- int i;
- Attribute *a;
-
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- ava->ava_type, NULL, ACL_SEARCH ) )
- {
- return( -2 );
- }
-
- a = attr_find( e->e_attrs, ava->ava_type );
- if ( a != NULL ) {
- /* for each value in the attribute */
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
- /*
- * try to match words in the filter value in order
- * in the attribute value.
- */
-
- w2 = a->a_vals[i]->bv_val;
- /* for each word in the filter value */
- for ( w1 = first_word( ava->ava_value.bv_val ); w1 != NULL;
- w1 = next_word( w1 ) ) {
- if ( (c1 = phonetic( w1 )) == NULL ) {
- break;
- }
-
- /*
- * for each word in the attribute value from
- * where we left off...
- */
- for ( w2 = first_word( w2 ); w2 != NULL;
- w2 = next_word( w2 ) ) {
- c2 = phonetic( w2 );
- if ( strcmp( c1, c2 ) == 0 ) {
- free( c2 );
- break;
- }
- free( c2 );
- }
- free( c1 );
-
- /*
- * if we stopped because we ran out of words
- * before making a match, go on to the next
- * value. otherwise try to keep matching
- * words in this value from where we left off.
- */
- if ( w2 == NULL ) {
- break;
- } else {
- w2 = next_word( w2 );
- }
- }
- /*
- * if we stopped because we ran out of words we
- * have a match.
- */
- if ( w1 == NULL ) {
- return LDAP_COMPARE_TRUE;
- }
- }
- }
-
- return LDAP_COMPARE_FALSE;
-}
-#endif
static int
test_filter_and(
)
{
Filter *f;
- int rtn = LDAP_COMPARE_TRUE;
+ int rtn = LDAP_COMPARE_TRUE; /* True if empty */
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_filter_and: begin\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter_and\n", 0, 0, 0 );
+#endif
+
for ( f = flist; f != NULL; f = f->f_next ) {
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;
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_filter_and: rc=%d\n", rtn ));
+#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter_and %d\n", rtn, 0, 0 );
+#endif
+
return rtn;
}
)
{
Filter *f;
- int rtn = LDAP_COMPARE_FALSE;
+ int rtn = LDAP_COMPARE_FALSE; /* False if empty */
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_filter_or: begin\n" ));
+#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter_or\n", 0, 0, 0 );
+#endif
+
for ( f = flist; f != NULL; f = f->f_next ) {
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;
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_filter_or: result=%d\n", rtn ));
+#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter_or %d\n", rtn, 0, 0 );
+#endif
+
return rtn;
}
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-static void
-strcpy_regex( char *d, char *s )
-{
- for ( ; *s; s++ ) {
- switch ( *s ) {
- case '^':
- case '.':
- case '[':
- case ']': /* ? */
- case '$':
- case '(':
- case ')': /* ? */
- case '|':
- case '*':
- case '+':
- case '?':
- case '{':
- case '}': /* ? */
- case '\\':
- *d++ = '\\';
- /* FALL */
- default:
- *d++ = *s;
- }
- }
- *d = '\0';
-}
-#endif
static int
-test_substring_filter(
+test_substrings_filter(
Backend *be,
Connection *conn,
Operation *op,
Filter *f
)
{
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
Attribute *a;
- int i, rc;
- char *p, *end, *realval, *tmp;
- char pat[BUFSIZ];
- char buf[BUFSIZ];
- struct berval *val;
- regex_t re;
- Debug( LDAP_DEBUG_FILTER, "begin test_substring_filter\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_substrings_filter: begin\n" ));
+#else
+ Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
+#endif
- if ( be != NULL && ! access_allowed( be, conn, op, e,
- f->f_sub_type, NULL, ACL_SEARCH ) )
- {
- return( -2 );
- }
- if ( (a = attr_find( e->e_attrs, f->f_sub_type )) == NULL ) {
- return LDAP_COMPARE_FALSE;
+ if ( !access_allowed( be, conn, op, e,
+ f->f_sub_desc, NULL, ACL_SEARCH ) )
+ {
+ return LDAP_INSUFFICIENT_ACCESS;
}
- if ( a->a_syntax & SYNTAX_BIN ) {
- Debug( LDAP_DEBUG_FILTER, "test_substring_filter bin attr\n",
- 0, 0, 0 );
- return( -1 );
- }
+ 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;
+ struct berval *bv;
- /*
- * construct a regular expression corresponding to the
- * filter and let regex do the work
- */
-
- pat[0] = '\0';
- p = pat;
- end = pat + sizeof(pat) - 2; /* leave room for null */
- if ( f->f_sub_initial != NULL ) {
- strcpy( p, "^" );
- p = strchr( p, '\0' );
- /* 2 * in case every char is special */
- if ( p + 2 * f->f_sub_initial->bv_len > end ) {
- Debug( LDAP_DEBUG_ANY, "not enough pattern space\n",
- 0, 0, 0 );
- return( -1 );
- }
- strcpy_regex( p, f->f_sub_initial->bv_val );
- p = strchr( p, '\0' );
- }
- if ( f->f_sub_any != NULL ) {
- for ( i = 0; f->f_sub_any[i] != NULL; i++ ) {
- /* ".*" + value */
- 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 );
- }
- strcpy( p, ".*" );
- p = strchr( p, '\0' );
- strcpy_regex( p, f->f_sub_any[i]->bv_val );
- p = strchr( p, '\0' );
- }
- }
- if ( f->f_sub_final != NULL ) {
- /* ".*" + value */
- if ( p + 2 * f->f_sub_final->bv_len + 2 > end ) {
- Debug( LDAP_DEBUG_ANY, "not enough pattern space\n",
- 0, 0, 0 );
- return( -1 );
+ if( mr == NULL ) {
+ continue;
}
- strcpy( p, ".*" );
- p = strchr( p, '\0' );
- strcpy_regex( p, f->f_sub_final->bv_val );
- p = strchr( p, '\0' );
- strcpy( p, "$" );
- }
-
- /* compile the regex */
- Debug( LDAP_DEBUG_FILTER, "test_substring_filter: regcomp pat: %s\n",
- pat, 0, 0 );
- if ((rc = regcomp(&re, pat, REG_EXTENDED|REG_NOSUB))) {
- char error[512];
-
- regerror(rc, &re, error, sizeof(error));
- Debug( LDAP_DEBUG_ANY, "regcomp failed (%s) %s\n",
- p, error, 0 );
- return( -1 );
- }
- /* for each value in the attribute see if regex matches */
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
- val = a->a_vals[i];
- tmp = NULL;
- if ( val->bv_len < sizeof(buf) ) {
- strcpy( buf, val->bv_val );
- realval = buf;
- } else {
- tmp = (char *) ch_malloc( val->bv_len + 1 );
- strcpy( tmp, val->bv_val );
- realval = tmp;
- }
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+ int ret;
+ int rc;
+ const char *text;
- value_normalize( realval, a->a_syntax );
+ rc = value_match( &ret, a->a_desc, mr,
+ SLAP_MR_ASSERTION_SYNTAX_MATCH,
+ bv, f->f_sub, &text );
- rc = !regexec(&re, realval, 0, NULL, 0);
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
- if ( tmp != NULL ) {
- free( tmp );
- }
- if ( rc == 1 ) {
- regfree(&re);
- return LDAP_COMPARE_TRUE;
+ if ( ret == 0 ) {
+ return LDAP_COMPARE_TRUE;
+ }
}
}
- regfree(&re);
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+ "test_substrings_filter: return FALSE\n" ));
+#else
+ Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n", 0, 0, 0 );
#endif
- Debug( LDAP_DEBUG_FILTER, "end test_substring_filter 1\n", 0, 0, 0 );
return LDAP_COMPARE_FALSE;
}
projects / openldap / blobdiff