/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
if( err != LDAP_SUCCESS ) {
f.f_choice |= SLAPD_FILTER_UNDEFINED;
- err = slap_bv2undef_ad( &type, &f.f_desc, text, SLAP_AD_PROXIED);
+ 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,
op->o_connid, type.bv_val, err );
err = LDAP_SUCCESS;
+ f.f_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );
}
*text = NULL;
}
if( rc != LDAP_SUCCESS ) {
f->f_choice |= SLAPD_FILTER_UNDEFINED;
- rc = slap_bv2undef_ad( &desc, &ssa.sa_desc, text, SLAP_AD_PROXIED);
+ 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 );
- /* 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 ( 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;
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 );
}
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);
}
if ( err == LDAP_SUCCESS ) {
- *filt = ch_malloc( sizeof vrf );
+ *filt = op->o_tmpalloc( sizeof vrf, op->o_tmpmemctx );
**filt = vrf;
}
{
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;
}
- int undef = vrf->vrf_choice & SLAPD_FILTER_UNDEFINED;
+ undef = vrf->vrf_choice & SLAPD_FILTER_UNDEFINED;
switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
case LDAP_FILTER_EQUALITY: