/* filter.c - routines for parsing and dealing with filters */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2009 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#include "portable.h"
#include <ac/string.h>
#include "slap.h"
+#include "lutil.h"
+
+const Filter *slap_filter_objectClass_pres;
+const struct berval *slap_filterstr_objectClass_pres;
static int get_filter_list(
Operation *op,
static int get_ssa(
Operation *op,
BerElement *ber,
- SubstringsAssertion **s,
+ Filter *f,
const char **text );
static void simple_vrFilter2bv(
ValuesReturnFilter **f,
const char **text );
+int
+filter_init( void )
+{
+ static Filter filter_objectClass_pres = { LDAP_FILTER_PRESENT };
+ static struct berval filterstr_objectClass_pres = BER_BVC("(objectClass=*)");
+
+ filter_objectClass_pres.f_desc = slap_schema.si_ad_objectClass;
+
+ slap_filter_objectClass_pres = &filter_objectClass_pres;
+ slap_filterstr_objectClass_pres = &filterstr_objectClass_pres;
+
+ return 0;
+}
+
+void
+filter_destroy( void )
+{
+ return;
+}
+
int
get_filter(
Operation *op,
int err;
Filter f;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
-#endif
/*
* A filter looks like this coming in:
* Filter ::= CHOICE {
* substrings [4] SubstringFilter,
* greaterOrEqual [5] AttributeValueAssertion,
* lessOrEqual [6] AttributeValueAssertion,
- * present [7] AttributeType,,
- * approxMatch [8] AttributeValueAssertion
+ * present [7] AttributeType,
+ * approxMatch [8] AttributeValueAssertion,
* extensibleMatch [9] MatchingRuleAssertion
* }
*
switch ( f.f_choice ) {
case LDAP_FILTER_EQUALITY:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL2,
- "get_filter: conn %d EQUALITY\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &f.f_ava, SLAP_MR_EQUALITY, text );
+ err = get_ava( op, ber, &f, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {
break;
}
break;
case LDAP_FILTER_SUBSTRINGS:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d SUBSTRINGS\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
-#endif
- err = get_ssa( op, ber, &f.f_sub, text );
+ err = get_ssa( op, ber, &f, text );
if( err != LDAP_SUCCESS ) {
break;
}
break;
case LDAP_FILTER_GE:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d GE\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, &f, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
break;
case LDAP_FILTER_LE:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d LE\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, &f, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
case LDAP_FILTER_PRESENT: {
struct berval type;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d PRESENT\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
-#endif
if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {
err = SLAPD_DISCONNECT;
*text = "error decoding filter";
err = slap_bv2ad( &type, &f.f_desc, text );
if( err != LDAP_SUCCESS ) {
- /* unrecognized attribute description or other error */
- f.f_choice = SLAPD_FILTER_COMPUTED;
- f.f_result = LDAP_COMPARE_FALSE;
- err = LDAP_SUCCESS;
+ f.f_choice |= SLAPD_FILTER_UNDEFINED;
+ err = slap_bv2undef_ad( &type, &f.f_desc, text,
+ SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
+
+ if ( err != LDAP_SUCCESS ) {
+ /* unrecognized attribute description or other error */
+ Debug( LDAP_DEBUG_ANY,
+ "get_filter: conn %lu unknown attribute "
+ "type=%s (%d)\n",
+ op->o_connid, type.bv_val, err );
+
+ err = LDAP_SUCCESS;
+ f.f_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );
+ }
*text = NULL;
- break;
}
assert( f.f_desc != NULL );
} break;
case LDAP_FILTER_APPROX:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d APPROX\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text );
+ err = get_ava( op, ber, &f, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {
break;
}
break;
case LDAP_FILTER_AND:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d AND\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
-#endif
err = get_filter_list( op, ber, &f.f_and, text );
if ( err != LDAP_SUCCESS ) {
break;
break;
case LDAP_FILTER_OR:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d OR\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
-#endif
err = get_filter_list( op, ber, &f.f_or, text );
if ( err != LDAP_SUCCESS ) {
break;
break;
case LDAP_FILTER_NOT:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d NOT\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
-#endif
(void) ber_skip_tag( ber, &len );
err = get_filter( op, ber, &f.f_not, text );
if ( err != LDAP_SUCCESS ) {
assert( f.f_not != NULL );
if ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {
+ int fresult = f.f_not->f_result;
f.f_choice = SLAPD_FILTER_COMPUTED;
- f.f_result = f.f_not->f_result;
op->o_tmpfree( f.f_not, op->o_tmpmemctx );
f.f_not = NULL;
- switch( f.f_result ) {
+ switch( fresult ) {
case LDAP_COMPARE_TRUE:
f.f_result = LDAP_COMPARE_FALSE;
break;
case LDAP_COMPARE_FALSE:
f.f_result = LDAP_COMPARE_TRUE;
break;
- default:
+ default: ;
/* (!Undefined) is Undefined */
}
}
break;
case LDAP_FILTER_EXT:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d EXTENSIBLE\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
-#endif
- err = get_mra( op, ber, &f.f_mra, text );
+ err = get_mra( op, ber, &f, text );
if ( err != LDAP_SUCCESS ) {
break;
}
default:
(void) ber_scanf( ber, "x" ); /* skip the element */
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ERR,
- "get_filter: conn %d unknown filter type=%lu\n",
- op->o_connid, f.f_choice, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
f.f_choice, 0, 0 );
-#endif
f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = SLAPD_COMPARE_UNDEFINED;
break;
**filt = f;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL2,
- "get_filter: conn %d exit\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
-#endif
return( err );
}
ber_len_t len;
char *last;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_filter_list: conn %d start\n", op->o_connid, 0, 0 );
-#else
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;
}
*new = NULL;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_filter_list: conn %d exit\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
-#endif
return( LDAP_SUCCESS );
}
get_ssa(
Operation *op,
BerElement *ber,
- SubstringsAssertion **out,
+ Filter *f,
const char **text )
{
ber_tag_t tag;
ber_len_t len;
- ber_tag_t rc;
+ int rc;
struct berval desc, value, nvalue;
char *last;
SubstringsAssertion ssa;
*text = "error decoding filter";
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_ssa: conn %d begin\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "begin get_ssa\n", 0, 0, 0 );
-#endif
if ( ber_scanf( ber, "{m" /*}*/, &desc ) == LBER_ERROR ) {
return SLAPD_DISCONNECT;
}
rc = slap_bv2ad( &desc, &ssa.sa_desc, text );
if( rc != LDAP_SUCCESS ) {
- /* skip over the rest of this filter */
- for ( tag = ber_first_element( ber, &len, &last );
- tag != LBER_DEFAULT;
- tag = ber_next_element( ber, &len, last ) ) {
- ber_scanf( ber, "x" );
+ f->f_choice |= SLAPD_FILTER_UNDEFINED;
+ rc = slap_bv2undef_ad( &desc, &ssa.sa_desc, text,
+ SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
+
+ if( rc != LDAP_SUCCESS ) {
+ Debug( LDAP_DEBUG_ANY,
+ "get_ssa: conn %lu unknown attribute type=%s (%ld)\n",
+ op->o_connid, desc.bv_val, (long) rc );
+
+ ssa.sa_desc = slap_bv2tmp_ad( &desc, op->o_tmpmemctx );
}
- return rc;
}
rc = LDAP_PROTOCOL_ERROR;
+ /* If there is no substring matching rule, there's nothing
+ * we can do with this filter. But we continue to parse it
+ * for logging purposes.
+ */
+ if ( ssa.sa_desc->ad_type->sat_substr == NULL ) {
+ f->f_choice |= SLAPD_FILTER_UNDEFINED;
+ Debug( LDAP_DEBUG_FILTER,
+ "get_ssa: no substring matching rule for attributeType %s\n",
+ desc.bv_val, 0, 0 );
+ }
+
for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )
switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:
+ if ( ssa.sa_initial.bv_val != NULL
+ || ssa.sa_any != NULL
+ || ssa.sa_final.bv_val != NULL )
+ {
+ rc = LDAP_PROTOCOL_ERROR;
+ goto return_error;
+ }
usage = SLAP_MR_SUBSTR_INITIAL;
break;
case LDAP_SUBSTRING_ANY:
+ if ( ssa.sa_final.bv_val != NULL ) {
+ rc = LDAP_PROTOCOL_ERROR;
+ goto return_error;
+ }
usage = SLAP_MR_SUBSTR_ANY;
break;
case LDAP_SUBSTRING_FINAL:
+ if ( ssa.sa_final.bv_val != NULL ) {
+ rc = LDAP_PROTOCOL_ERROR;
+ goto return_error;
+ }
+
usage = SLAP_MR_SUBSTR_FINAL;
break;
default:
- rc = LDAP_PROTOCOL_ERROR;
-
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ERR,
- "get_filter_substring: conn %d unknown substring choice=%ld\n",
- op->o_connid, (long)tag, 0 );
-#else
Debug( LDAP_DEBUG_FILTER,
" unknown substring choice=%ld\n",
(long) tag, 0, 0 );
-#endif
+ rc = LDAP_PROTOCOL_ERROR;
goto return_error;
}
rc = asserted_value_validate_normalize(
ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,
usage, &value, &nvalue, text, op->o_tmpmemctx );
-
if( rc != LDAP_SUCCESS ) {
- goto return_error;
+ f->f_choice |= SLAPD_FILTER_UNDEFINED;
+ Debug( LDAP_DEBUG_FILTER,
+ "get_ssa: illegal value for attributeType %s (%d) %s\n",
+ desc.bv_val, rc, *text );
+ ber_dupbv_x( &nvalue, &value, op->o_tmpmemctx );
}
- rc = LDAP_PROTOCOL_ERROR;
-
switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_ssa: conn %d INITIAL\n",
- op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );
-#endif
-
- if ( ssa.sa_initial.bv_val != NULL
- || ssa.sa_any != NULL
- || ssa.sa_final.bv_val != NULL )
- {
- sl_free( nvalue.bv_val, op->o_tmpmemctx );
- goto return_error;
- }
-
ssa.sa_initial = nvalue;
break;
case LDAP_SUBSTRING_ANY:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_ssa: conn %d ANY\n",
- op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
-#endif
-
- if ( ssa.sa_final.bv_val != NULL ) {
- sl_free( nvalue.bv_val, op->o_tmpmemctx );
- goto return_error;
- }
-
ber_bvarray_add_x( &ssa.sa_any, &nvalue, op->o_tmpmemctx );
break;
case LDAP_SUBSTRING_FINAL:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_ssa: conn %d FINAL\n",
- op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );
-#endif
-
- if ( ssa.sa_final.bv_val != NULL ) {
- sl_free( nvalue.bv_val, op->o_tmpmemctx );
- goto return_error;
- }
-
ssa.sa_final = nvalue;
break;
default:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, INFO,
- "get_ssa: conn %d unknown substring type %ld\n",
- op->o_connid, (long)tag, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER,
- " unknown substring type=%ld\n",
- (long) tag, 0, 0 );
-#endif
-
assert( 0 );
- sl_free( nvalue.bv_val, op->o_tmpmemctx );
+ slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
+ rc = LDAP_PROTOCOL_ERROR;
return_error:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, INFO,
- "get_ssa: conn %d error %ld\n",
- op->o_connid, (long)rc, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
(long) rc, 0, 0 );
-#endif
- sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );
+ slap_sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );
ber_bvarray_free_x( ssa.sa_any, op->o_tmpmemctx );
- sl_free( ssa.sa_final.bv_val, op->o_tmpmemctx );
+ if ( ssa.sa_desc->ad_flags & SLAP_DESC_TEMPORARY )
+ op->o_tmpfree( ssa.sa_desc, op->o_tmpmemctx );
+ slap_sl_free( ssa.sa_final.bv_val, op->o_tmpmemctx );
return rc;
}
+ *text = NULL;
rc = LDAP_SUCCESS;
}
if( rc == LDAP_SUCCESS ) {
- *out = op->o_tmpalloc( sizeof( ssa ), op->o_tmpmemctx );
- **out = ssa;
+ f->f_sub = op->o_tmpalloc( sizeof( ssa ), op->o_tmpmemctx );
+ *f->f_sub = ssa;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_ssa: conn %d exit\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );
-#endif
-
- return LDAP_SUCCESS;
+ return rc /* LDAP_SUCCESS */ ;
}
void
-filter_free_x( Operation *op, Filter *f )
+filter_free_x( Operation *op, Filter *f, int freeme )
{
Filter *p, *next;
return;
}
+ f->f_choice &= SLAPD_FILTER_MASK;
+
switch ( f->f_choice ) {
case LDAP_FILTER_PRESENT:
break;
if ( f->f_sub_final.bv_val != NULL ) {
op->o_tmpfree( f->f_sub_final.bv_val, op->o_tmpmemctx );
}
+ if ( f->f_sub->sa_desc->ad_flags & SLAP_DESC_TEMPORARY )
+ op->o_tmpfree( f->f_sub->sa_desc, op->o_tmpmemctx );
op->o_tmpfree( f->f_sub, op->o_tmpmemctx );
break;
case LDAP_FILTER_NOT:
for ( p = f->f_list; p != NULL; p = next ) {
next = p->f_next;
- filter_free_x( op, p );
+ filter_free_x( op, p, 1 );
}
break;
break;
default:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ERR,
- "filter_free: unknown filter type %lu\n", f->f_choice, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
f->f_choice, 0, 0 );
-#endif
break;
}
- op->o_tmpfree( f, op->o_tmpmemctx );
+ if ( freeme ) {
+ op->o_tmpfree( f, op->o_tmpmemctx );
+ }
}
void
filter_free( Filter *f )
{
Operation op;
+ Opheader ohdr;
- op.o_tmpmemctx = sl_context( f );
- op.o_tmpmfuncs = &sl_mfuncs;
- filter_free_x( &op, f );
+ op.o_hdr = &ohdr;
+ op.o_tmpmemctx = slap_sl_context( f );
+ op.o_tmpmfuncs = &slap_sl_mfuncs;
+ filter_free_x( &op, f, 1 );
}
void
filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
{
- int i;
- Filter *p;
- struct berval tmp;
- ber_len_t len;
+ int i;
+ Filter *p;
+ struct berval tmp, value;
+ static struct berval
+ ber_bvfalse = BER_BVC( "(?=false)" ),
+ ber_bvtrue = BER_BVC( "(?=true)" ),
+ ber_bvundefined = BER_BVC( "(?=undefined)" ),
+ ber_bverror = BER_BVC( "(?=error)" ),
+ ber_bvunknown = BER_BVC( "(?=unknown)" ),
+ ber_bvnone = BER_BVC( "(?=none)" );
+ ber_len_t len;
+ ber_tag_t choice;
+ int undef;
+ char *sign;
if ( f == NULL ) {
- ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );
+ ber_dupbv_x( fstr, &ber_bvnone, op->o_tmpmemctx );
return;
}
- switch ( f->f_choice ) {
- case LDAP_FILTER_EQUALITY:
- filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
-
- fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(=)") - 1 );
- fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
-
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
- f->f_av_desc->ad_cname.bv_val,
- tmp.bv_val );
-
- ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
- break;
+ undef = f->f_choice & SLAPD_FILTER_UNDEFINED;
+ choice = f->f_choice & SLAPD_FILTER_MASK;
+ switch ( choice ) {
+ case LDAP_FILTER_EQUALITY:
+ fstr->bv_len = STRLENOF("(=)");
+ sign = "=";
+ goto simple;
case LDAP_FILTER_GE:
- filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
-
- fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(>=)") - 1 );
- fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
-
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
- f->f_av_desc->ad_cname.bv_val,
- tmp.bv_val );
-
- ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
- break;
-
+ fstr->bv_len = STRLENOF("(>=)");
+ sign = ">=";
+ goto simple;
case LDAP_FILTER_LE:
- filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
-
- fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(<=)") - 1 );
- fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_len = STRLENOF("(<=)");
+ sign = "<=";
+ goto simple;
+ case LDAP_FILTER_APPROX:
+ fstr->bv_len = STRLENOF("(~=)");
+ sign = "~=";
+
+simple:
+ value = f->f_av_value;
+ if ( f->f_av_desc->ad_type->sat_equality &&
+ !undef &&
+ ( f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ))
+ {
+ f->f_av_desc->ad_type->sat_equality->smr_normalize(
+ (SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
+ NULL, NULL, &f->f_av_value, &value, op->o_tmpmemctx );
+ }
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
- f->f_av_desc->ad_cname.bv_val,
- tmp.bv_val );
+ filter_escape_value_x( &value, &tmp, op->o_tmpmemctx );
+ /* NOTE: tmp can legitimately be NULL (meaning empty)
+ * since in a Filter values in AVAs are supposed
+ * to have been normalized, meaning that an empty value
+ * is legal for that attribute's syntax */
- ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
- break;
+ fstr->bv_len += f->f_av_desc->ad_cname.bv_len + tmp.bv_len;
+ if ( undef )
+ fstr->bv_len++;
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
- case LDAP_FILTER_APPROX:
- filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
+ snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s)",
+ undef ? "?" : "",
+ f->f_av_desc->ad_cname.bv_val, sign,
+ tmp.bv_len ? tmp.bv_val : "" );
- fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(~=)") - 1 );
- fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
+ if ( value.bv_val != f->f_av_value.bv_val ) {
+ ber_memfree_x( value.bv_val, op->o_tmpmemctx );
+ }
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
- f->f_av_desc->ad_cname.bv_val,
- tmp.bv_val );
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_SUBSTRINGS:
fstr->bv_len = f->f_sub_desc->ad_cname.bv_len +
- ( sizeof("(=*)") - 1 );
+ STRLENOF("(=*)");
+ if ( undef )
+ fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
+ snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s=*)",
+ undef ? "?" : "",
f->f_sub_desc->ad_cname.bv_val );
if ( f->f_sub_initial.bv_val != NULL ) {
+ ber_len_t tmplen;
+
len = fstr->bv_len;
filter_escape_value_x( &f->f_sub_initial, &tmp, op->o_tmpmemctx );
+ tmplen = tmp.bv_len;
- fstr->bv_len += tmp.bv_len;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_len += tmplen;
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
+ fstr->bv_len + 1, op->o_tmpmemctx );
- snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,
+ snprintf( &fstr->bv_val[len - 2],
+ tmplen + STRLENOF( /*(*/ "*)" ) + 1,
/* "(attr=" */ "%s*)",
- tmp.bv_val );
+ tmp.bv_len ? tmp.bv_val : "");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
if ( f->f_sub_any != NULL ) {
for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) {
+ ber_len_t tmplen;
+
len = fstr->bv_len;
- filter_escape_value_x( &f->f_sub_any[i], &tmp, op->o_tmpmemctx );
+ filter_escape_value_x( &f->f_sub_any[i],
+ &tmp, op->o_tmpmemctx );
+ tmplen = tmp.bv_len;
- fstr->bv_len += tmp.bv_len + 1;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_len += tmplen + STRLENOF( /*(*/ ")" );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
+ fstr->bv_len + 1, op->o_tmpmemctx );
- snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
+ snprintf( &fstr->bv_val[len - 1],
+ tmplen + STRLENOF( /*(*/ "*)" ) + 1,
/* "(attr=[init]*[any*]" */ "%s*)",
- tmp.bv_val );
+ tmp.bv_len ? tmp.bv_val : "");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
}
if ( f->f_sub_final.bv_val != NULL ) {
+ ber_len_t tmplen;
+
len = fstr->bv_len;
filter_escape_value_x( &f->f_sub_final, &tmp, op->o_tmpmemctx );
+ tmplen = tmp.bv_len;
- fstr->bv_len += tmp.bv_len;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_len += tmplen;
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
+ fstr->bv_len + 1, op->o_tmpmemctx );
- snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
+ snprintf( &fstr->bv_val[len - 1],
+ tmplen + STRLENOF( /*(*/ ")" ) + 1,
/* "(attr=[init*][any*]" */ "%s)",
- tmp.bv_val );
+ tmp.bv_len ? tmp.bv_val : "");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
case LDAP_FILTER_PRESENT:
fstr->bv_len = f->f_desc->ad_cname.bv_len +
- ( sizeof("(=*)") - 1 );
+ STRLENOF("(=*)");
+ if ( undef )
+ fstr->bv_len++;
+
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
+ snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s=*)",
+ undef ? "?" : "",
f->f_desc->ad_cname.bv_val );
break;
case LDAP_FILTER_AND:
case LDAP_FILTER_OR:
case LDAP_FILTER_NOT:
- fstr->bv_len = sizeof("(%)") - 1;
+ fstr->bv_len = STRLENOF("(%)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)",
filter2bv_x( op, p, &tmp );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+ op->o_tmpmemctx );
- snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,
+ snprintf( &fstr->bv_val[len-1],
+ tmp.bv_len + STRLENOF( /*(*/ ")" ) + 1,
/*"("*/ "%s)", tmp.bv_val );
op->o_tmpfree( tmp.bv_val, op->o_tmpmemctx );
case LDAP_FILTER_EXT: {
struct berval ad;
+
filter_escape_value_x( &f->f_mr_value, &tmp, op->o_tmpmemctx );
+ /* NOTE: tmp can legitimately be NULL (meaning empty)
+ * since in a Filter values in MRAs are supposed
+ * to have been normalized, meaning that an empty value
+ * is legal for that attribute's syntax */
if ( f->f_mr_desc ) {
ad = f->f_mr_desc->ad_cname;
ad.bv_len = 0;
ad.bv_val = "";
}
-
+
fstr->bv_len = ad.bv_len +
- ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
+ ( f->f_mr_dnattrs ? STRLENOF(":dn") : 0 ) +
( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
- tmp.bv_len + ( sizeof("(:=)") - 1 );
+ tmp.bv_len + STRLENOF("(:=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
+ snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s%s:=%s)",
+ undef ? "?" : "",
ad.bv_val,
f->f_mr_dnattrs ? ":dn" : "",
f->f_mr_rule_text.bv_len ? ":" : "",
f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
- tmp.bv_val );
+ tmp.bv_len ? tmp.bv_val : "" );
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
} break;
case SLAPD_FILTER_COMPUTED:
- ber_str2bv_x(
- 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 == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :
- f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
- f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
- sizeof("(?=error)")-1,
- 1, fstr, op->o_tmpmemctx );
- break;
+ switch ( f->f_result ) {
+ case LDAP_COMPARE_FALSE:
+ tmp = ber_bvfalse;
+ break;
+
+ case LDAP_COMPARE_TRUE:
+ tmp = ber_bvtrue;
+ break;
+
+ case SLAPD_COMPARE_UNDEFINED:
+ tmp = ber_bvundefined;
+ break;
+
+ default:
+ tmp = ber_bverror;
+ break;
+ }
+ ber_dupbv_x( fstr, &tmp, op->o_tmpmemctx );
+ break;
+
default:
- ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
- 1, fstr, op->o_tmpmemctx );
+ ber_dupbv_x( fstr, &ber_bvunknown, op->o_tmpmemctx );
break;
}
}
filter2bv( Filter *f, struct berval *fstr )
{
Operation op;
+ Opheader ohdr;
+
+ op.o_hdr = &ohdr;
op.o_tmpmemctx = NULL;
op.o_tmpmfuncs = &ch_mfuncs;
filter2bv_x( &op, f, fstr );
}
-int
-filter_escape_value_x(
- struct berval *in,
- struct berval *out,
- void *ctx )
+Filter *
+filter_dup( Filter *f, void *memctx )
{
- ber_len_t i;
- assert( in );
- assert( out );
-
- i = in->bv_len * 3 + 1;
- out->bv_val = ctx ? sl_malloc( i, ctx ) : ch_malloc( i );
- out->bv_len = 0;
-
- for( i=0; i < in->bv_len ; i++ ) {
- if( FILTER_ESCAPE(in->bv_val[i]) ) {
- out->bv_val[out->bv_len++] = SLAP_ESCAPE_CHAR;
- out->bv_val[out->bv_len++] = SLAP_ESCAPE_HI( in->bv_val[i] );
- out->bv_val[out->bv_len++] = SLAP_ESCAPE_LO( in->bv_val[i] );
- } else {
- out->bv_val[out->bv_len++] = in->bv_val[i];
- }
- }
+ BerMemoryFunctions *mf = &slap_sl_mfuncs;
+ Filter *n;
- out->bv_val[out->bv_len] = '\0';
- return LDAP_SUCCESS;
-}
+ if ( !f )
+ return NULL;
-int
-filter_escape_value(
- struct berval *in,
- struct berval *out )
-{
- return filter_escape_value_x( in, out, NULL );
+ n = mf->bmf_malloc( sizeof(Filter), memctx );
+ n->f_choice = f->f_choice;
+ n->f_next = NULL;
+
+ switch( f->f_choice & SLAPD_FILTER_MASK ) {
+ case SLAPD_FILTER_COMPUTED:
+ n->f_result = f->f_result;
+ break;
+ case LDAP_FILTER_PRESENT:
+ if ( f->f_desc->ad_flags & SLAP_DESC_TEMPORARY )
+ n->f_desc = slap_bv2tmp_ad( &f->f_desc->ad_cname, memctx );
+ else
+ n->f_desc = f->f_desc;
+ break;
+ case LDAP_FILTER_EQUALITY:
+ case LDAP_FILTER_GE:
+ case LDAP_FILTER_LE:
+ case LDAP_FILTER_APPROX:
+ /* Should this be ava_dup() ? */
+ n->f_ava = mf->bmf_calloc( 1, sizeof(AttributeAssertion), memctx );
+ *n->f_ava = *f->f_ava;
+ if ( f->f_av_desc->ad_flags & SLAP_DESC_TEMPORARY )
+ n->f_av_desc = slap_bv2tmp_ad( &f->f_av_desc->ad_cname, memctx );
+ ber_dupbv_x( &n->f_av_value, &f->f_av_value, memctx );
+ break;
+ case LDAP_FILTER_SUBSTRINGS:
+ n->f_sub = mf->bmf_calloc( 1, sizeof(SubstringsAssertion), memctx );
+ if ( f->f_sub_desc->ad_flags & SLAP_DESC_TEMPORARY )
+ n->f_sub_desc = slap_bv2tmp_ad( &f->f_sub_desc->ad_cname, memctx );
+ else
+ n->f_sub_desc = f->f_sub_desc;
+ if ( !BER_BVISNULL( &f->f_sub_initial ))
+ ber_dupbv_x( &n->f_sub_initial, &f->f_sub_initial, memctx );
+ if ( f->f_sub_any ) {
+ int i;
+ for ( i = 0; !BER_BVISNULL( &f->f_sub_any[i] ); i++ );
+ n->f_sub_any = mf->bmf_malloc(( i+1 )*sizeof( struct berval ),
+ memctx );
+ for ( i = 0; !BER_BVISNULL( &f->f_sub_any[i] ); i++ ) {
+ ber_dupbv_x( &n->f_sub_any[i], &f->f_sub_any[i], memctx );
+ }
+ BER_BVZERO( &n->f_sub_any[i] );
+ }
+ if ( !BER_BVISNULL( &f->f_sub_final ))
+ ber_dupbv_x( &n->f_sub_final, &f->f_sub_final, memctx );
+ break;
+ case LDAP_FILTER_EXT: {
+ /* Should this be mra_dup() ? */
+ ber_len_t length;
+ length = sizeof(MatchingRuleAssertion);
+ if ( !BER_BVISNULL( &f->f_mr_rule_text ))
+ length += f->f_mr_rule_text.bv_len + 1;
+ n->f_mra = mf->bmf_calloc( 1, length, memctx );
+ *n->f_mra = *f->f_mra;
+ if ( f->f_mr_desc && ( f->f_sub_desc->ad_flags & SLAP_DESC_TEMPORARY ))
+ n->f_mr_desc = slap_bv2tmp_ad( &f->f_mr_desc->ad_cname, memctx );
+ ber_dupbv_x( &n->f_mr_value, &f->f_mr_value, memctx );
+ if ( !BER_BVISNULL( &f->f_mr_rule_text )) {
+ n->f_mr_rule_text.bv_val = (char *)(n->f_mra+1);
+ AC_MEMCPY(n->f_mr_rule_text.bv_val,
+ f->f_mr_rule_text.bv_val, f->f_mr_rule_text.bv_len );
+ }
+ } break;
+ case LDAP_FILTER_AND:
+ case LDAP_FILTER_OR:
+ case LDAP_FILTER_NOT: {
+ Filter **p;
+ for ( p = &n->f_list, f = f->f_list; f; f = f->f_next ) {
+ *p = filter_dup( f, memctx );
+ p = &(*p)->f_next;
+ }
+ } break;
+ }
+ return n;
}
static int
int err;
ValuesReturnFilter vrf;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_simple_vrFilter: conn %d\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "begin get_simple_vrFilter\n", 0, 0, 0 );
-#endif
tag = ber_peek_tag( ber, &len );
switch ( vrf.vrf_choice ) {
case LDAP_FILTER_EQUALITY:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL2,
- "get_simple_vrFilter: conn %d EQUALITY\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY, text );
+ err = get_ava( op, ber, (Filter *)&vrf, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {
break;
}
break;
case LDAP_FILTER_SUBSTRINGS:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d SUBSTRINGS\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
-#endif
- err = get_ssa( op, ber, &vrf.vrf_sub, text );
+ err = get_ssa( op, ber, (Filter *)&vrf, text );
break;
case LDAP_FILTER_GE:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d GE\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, (Filter *)&vrf, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
break;
case LDAP_FILTER_LE:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d LE\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, (Filter *)&vrf, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
case LDAP_FILTER_PRESENT: {
struct berval type;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d PRESENT\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
-#endif
if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {
err = SLAPD_DISCONNECT;
*text = "error decoding filter";
err = slap_bv2ad( &type, &vrf.vrf_desc, text );
if( err != LDAP_SUCCESS ) {
- /* unrecognized attribute description or other error */
- vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
- vrf.vrf_result = LDAP_COMPARE_FALSE;
- err = LDAP_SUCCESS;
- break;
+ vrf.vrf_choice |= SLAPD_FILTER_UNDEFINED;
+ err = slap_bv2undef_ad( &type, &vrf.vrf_desc, text,
+ SLAP_AD_PROXIED);
+
+ if( err != LDAP_SUCCESS ) {
+ /* unrecognized attribute description or other error */
+ Debug( LDAP_DEBUG_ANY,
+ "get_simple_vrFilter: conn %lu unknown "
+ "attribute type=%s (%d)\n",
+ op->o_connid, type.bv_val, err );
+
+ vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
+ vrf.vrf_result = LDAP_COMPARE_FALSE;
+ err = LDAP_SUCCESS;
+ break;
+ }
}
} break;
case LDAP_FILTER_APPROX:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d APPROX\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
-#endif
- err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY_APPROX, text );
+ err = get_ava( op, ber, (Filter *)&vrf, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {
break;
}
break;
case LDAP_FILTER_EXT:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d EXTENSIBLE\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
-#endif
- err = get_mra( op, ber, &vrf.vrf_mra, text );
+ err = get_mra( op, ber, (Filter *)&vrf, text );
if ( err != LDAP_SUCCESS ) {
break;
}
default:
(void) ber_scanf( ber, "x" ); /* skip the element */
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ERR,
- "get_simple_vrFilter: conn %d unknown filter type=%lu\n",
- op->o_connid, vrf.vrf_choice, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n",
vrf.vrf_choice, 0, 0 );
-#endif
vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
vrf.vrf_result = SLAPD_COMPARE_UNDEFINED;
break;
}
if ( err == LDAP_SUCCESS ) {
- *filt = ch_malloc( sizeof vrf );
+ *filt = op->o_tmpalloc( sizeof vrf, op->o_tmpmemctx );
**filt = vrf;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL2,
- "get_simple_vrFilter: conn %d exit\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 );
-#endif
return err;
}
ber_len_t len;
char *last;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_vrFilter: conn %d start\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "begin get_vrFilter\n", 0, 0, 0 );
-#endif
tag = ber_peek_tag( ber, &len );
}
*n = NULL;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_vrFilter: conn %d exit\n", op->o_connid, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "end get_vrFilter\n", 0, 0, 0 );
-#endif
return( LDAP_SUCCESS );
}
for ( p = vrf; p != NULL; p = next ) {
next = p->vrf_next;
- switch ( vrf->vrf_choice ) {
+ switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
case LDAP_FILTER_PRESENT:
break;
break;
default:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ERR,
- "filter_free: unknown filter type %lu\n", vrf->vrf_choice, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
vrf->vrf_choice, 0, 0 );
-#endif
break;
}
ber_len_t len;
if ( vrf == NULL ) {
- ber_str2bv_x( "No filter!", sizeof("No filter!")-1,
+ ber_str2bv_x( "No filter!", STRLENOF("No filter!"),
1, fstr, op->o_tmpmemctx );
return;
}
- fstr->bv_len = sizeof("()") - 1;
+ fstr->bv_len = STRLENOF("()");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "()");
simple_vrFilter2bv( op, p, &tmp );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+ op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,
/*"("*/ "%s)", tmp.bv_val );
{
struct berval tmp;
ber_len_t len;
+ int undef;
if ( vrf == NULL ) {
- ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );
+ ber_str2bv_x( "No filter!", STRLENOF("No filter!"), 1, fstr,
+ op->o_tmpmemctx );
return;
}
+ undef = vrf->vrf_choice & SLAPD_FILTER_UNDEFINED;
- switch ( vrf->vrf_choice ) {
+ switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
case LDAP_FILTER_EQUALITY:
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(=)") - 1 );
+ tmp.bv_len + STRLENOF("(=)");
+ if ( undef ) fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(>=)") - 1 );
+ tmp.bv_len + STRLENOF("(>=)");
+ if ( undef ) fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(<=)") - 1 );
+ tmp.bv_len + STRLENOF("(<=)");
+ if ( undef ) fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
- tmp.bv_len + ( sizeof("(~=)") - 1 );
+ tmp.bv_len + STRLENOF("(~=)");
+ if ( undef ) fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
case LDAP_FILTER_SUBSTRINGS:
fstr->bv_len = vrf->vrf_sub_desc->ad_cname.bv_len +
- ( sizeof("(=*)") - 1 );
+ STRLENOF("(=*)");
+ if ( undef ) fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
filter_escape_value_x( &vrf->vrf_sub_initial, &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+ op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,
/* "(attr=" */ "%s*)",
int i;
for ( i = 0; vrf->vrf_sub_any[i].bv_val != NULL; i++ ) {
len = fstr->bv_len;
- filter_escape_value_x( &vrf->vrf_sub_any[i], &tmp, op->o_tmpmemctx );
+ filter_escape_value_x( &vrf->vrf_sub_any[i], &tmp,
+ op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len + 1;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
+ fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init]*[any*]" */ "%s*)",
filter_escape_value_x( &vrf->vrf_sub_final, &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
+ op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init*][any*]" */ "%s)",
case LDAP_FILTER_PRESENT:
fstr->bv_len = vrf->vrf_desc->ad_cname.bv_len +
- ( sizeof("(=*)") - 1 );
+ STRLENOF("(=*)");
+ if ( undef ) fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
}
fstr->bv_len = ad.bv_len +
- ( vrf->vrf_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
- ( vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) +
- tmp.bv_len + ( sizeof("(:=)") - 1 );
+ ( vrf->vrf_mr_dnattrs ? STRLENOF(":dn") : 0 ) +
+ ( vrf->vrf_mr_rule_text.bv_len
+ ? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) +
+ tmp.bv_len + STRLENOF("(:=)");
+ if ( undef ) fstr->bv_len++;
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
ber_str2bv_x(
vrf->vrf_result == LDAP_COMPARE_FALSE ? "(?=false)" :
vrf->vrf_result == LDAP_COMPARE_TRUE ? "(?=true)" :
- vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :
- "(?=error)",
- vrf->vrf_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :
- vrf->vrf_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
- vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
- sizeof("(?=error)")-1,
+ vrf->vrf_result == SLAPD_COMPARE_UNDEFINED
+ ? "(?=undefined)" : "(?=error)",
+ vrf->vrf_result == LDAP_COMPARE_FALSE ? STRLENOF("(?=false)") :
+ vrf->vrf_result == LDAP_COMPARE_TRUE ? STRLENOF("(?=true)") :
+ vrf->vrf_result == SLAPD_COMPARE_UNDEFINED
+ ? STRLENOF("(?=undefined)") : STRLENOF("(?=error)"),
1, fstr, op->o_tmpmemctx );
break;
default:
- ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
+ ber_str2bv_x( "(?=unknown)", STRLENOF("(?=unknown)"),
1, fstr, op->o_tmpmemctx );
break;
}
projects / openldap / blobdiff