/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#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,
* 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:
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
- 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;
}
case LDAP_FILTER_SUBSTRINGS:
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
- err = get_ssa( op, ber, &f.f_sub, text );
+ err = get_ssa( op, ber, &f, text );
if( err != LDAP_SUCCESS ) {
break;
}
case LDAP_FILTER_GE:
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
- 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_LE:
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
- 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;
}
err = slap_bv2ad( &type, &f.f_desc, text );
if( err != LDAP_SUCCESS ) {
+ f.f_choice |= SLAPD_FILTER_UNDEFINED;
err = slap_bv2undef_ad( &type, &f.f_desc, text,
SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
"type=%s (%d)\n",
op->o_connid, type.bv_val, err );
- f.f_choice = SLAPD_FILTER_COMPUTED;
- f.f_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;
- *text = NULL;
- break;
+ f.f_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );
}
+ *text = NULL;
}
assert( f.f_desc != NULL );
case LDAP_FILTER_APPROX:
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
- 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;
}
case LDAP_FILTER_EXT:
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
- err = get_mra( op, ber, &f.f_mra, text );
+ err = get_mra( op, ber, &f, text );
if ( err != LDAP_SUCCESS ) {
break;
}
get_ssa(
Operation *op,
BerElement *ber,
- SubstringsAssertion **out,
+ Filter *f,
const char **text )
{
ber_tag_t tag;
SubstringsAssertion ssa;
*text = "error decoding filter";
- *out = NULL;
Debug( LDAP_DEBUG_FILTER, "begin get_ssa\n", 0, 0, 0 );
if ( ber_scanf( ber, "{m" /*}*/, &desc ) == LBER_ERROR ) {
rc = slap_bv2ad( &desc, &ssa.sa_desc, text );
if( rc != LDAP_SUCCESS ) {
+ f->f_choice |= SLAPD_FILTER_UNDEFINED;
rc = slap_bv2undef_ad( &desc, &ssa.sa_desc, text,
SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
"get_ssa: conn %lu unknown attribute type=%s (%ld)\n",
op->o_connid, desc.bv_val, (long) rc );
- /* 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" );
- }
- return rc;
+ ssa.sa_desc = slap_bv2tmp_ad( &desc, op->o_tmpmemctx );
}
}
(long) rc, 0, 0 );
slap_sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );
ber_bvarray_free_x( ssa.sa_any, 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;
}
}
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;
}
Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );
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;
{
int i;
Filter *p;
- struct berval tmp;
+ struct berval tmp, value;
static struct berval
ber_bvfalse = BER_BVC( "(?=false)" ),
ber_bvtrue = BER_BVC( "(?=true)" ),
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_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 );
- /* 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 */
-
- fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
- 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)",
- f->f_av_desc->ad_cname.bv_val,
- tmp.bv_len ? 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 );
- /* 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 */
-
- fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
- 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)",
- f->f_av_desc->ad_cname.bv_val,
- tmp.bv_len ? 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 = 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 );
+ }
+
+ 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 */
- fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
- tmp.bv_len + STRLENOF("(<=)");
+ 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 );
- snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
- f->f_av_desc->ad_cname.bv_val,
- tmp.bv_len ? tmp.bv_val : "");
-
- ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
- break;
-
- case LDAP_FILTER_APPROX:
- filter_escape_value_x( &f->f_av_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 */
+ 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 + STRLENOF("(~=)");
- 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_len ? 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 +
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 ) {
len = fstr->bv_len;
filter_escape_value_x( &f->f_sub_initial, &tmp, op->o_tmpmemctx );
- tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );
+ tmplen = tmp.bv_len;
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],
+ snprintf( &fstr->bv_val[len - 2],
tmplen + STRLENOF( /*(*/ "*)" ) + 1,
/* "(attr=" */ "%s*)",
- tmp.bv_len ? tmp.bv_val : "(null)");
+ tmp.bv_len ? tmp.bv_val : "");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
len = fstr->bv_len;
filter_escape_value_x( &f->f_sub_any[i],
&tmp, op->o_tmpmemctx );
- tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );
+ tmplen = tmp.bv_len;
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],
+ snprintf( &fstr->bv_val[len - 1],
tmplen + STRLENOF( /*(*/ "*)" ) + 1,
/* "(attr=[init]*[any*]" */ "%s*)",
- tmp.bv_len ? tmp.bv_val : "(null)");
+ tmp.bv_len ? tmp.bv_val : "");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
}
len = fstr->bv_len;
filter_escape_value_x( &f->f_sub_final, &tmp, op->o_tmpmemctx );
- tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );
+ tmplen = tmp.bv_len;
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],
+ snprintf( &fstr->bv_val[len - 1],
tmplen + STRLENOF( /*(*/ ")" ) + 1,
/* "(attr=[init*][any*]" */ "%s)",
- tmp.bv_len ? tmp.bv_val : "(null)");
+ 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 +
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;
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 ? ":" : "",
n->f_choice = f->f_choice;
n->f_next = NULL;
- switch( f->f_choice ) {
+ switch( f->f_choice & SLAPD_FILTER_MASK ) {
case SLAPD_FILTER_COMPUTED:
n->f_result = f->f_result;
break;
case LDAP_FILTER_PRESENT:
- n->f_desc = f->f_desc;
+ 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:
/* 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 );
- n->f_sub_desc = f->f_sub_desc;
+ 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 ) {
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);
switch ( vrf.vrf_choice ) {
case LDAP_FILTER_EQUALITY:
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
- 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;
}
case LDAP_FILTER_SUBSTRINGS:
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
- err = get_ssa( op, ber, &vrf.vrf_sub, text );
+ err = get_ssa( op, ber, (Filter *)&vrf, text );
break;
case LDAP_FILTER_GE:
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
- 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_LE:
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
- 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;
}
err = slap_bv2ad( &type, &vrf.vrf_desc, text );
if( err != LDAP_SUCCESS ) {
+ vrf.vrf_choice |= SLAPD_FILTER_UNDEFINED;
err = slap_bv2undef_ad( &type, &vrf.vrf_desc, text,
- SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
+ SLAP_AD_PROXIED);
if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */
case LDAP_FILTER_APPROX:
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
- 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;
}
case LDAP_FILTER_EXT:
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
- err = get_mra( op, ber, &vrf.vrf_mra, text );
+ err = get_mra( op, ber, (Filter *)&vrf, text );
if ( err != LDAP_SUCCESS ) {
break;
}
}
if ( err == LDAP_SUCCESS ) {
- *filt = ch_malloc( sizeof vrf );
+ *filt = op->o_tmpalloc( sizeof vrf, op->o_tmpmemctx );
**filt = vrf;
}
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;
{
struct berval tmp;
ber_len_t len;
+ int undef;
if ( vrf == NULL ) {
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 + 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)",
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
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)",
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
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)",
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
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 +
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=*)",
case LDAP_FILTER_PRESENT:
fstr->bv_len = vrf->vrf_desc->ad_cname.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=*)",
( 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)",