mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#4364 add filter_dup, don't use str2filter to dup filters.

Browse Source
This commit is contained in:
Howard Chu 2006-01-23 20:53:52 +00:00
parent 3407467ca2
commit 51c5916149
4 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
servers/slapd/filter.c
View File

@ -777,6 +777,81 @@ filter2bv( Filter *f, struct berval *fstr )
filter2bv_x( &op, f, fstr );
}
Filter *
filter_dup( Filter *f, void *memctx )
{
BerMemoryFunctions *mf = &slap_sl_mfuncs;
Filter *n;
if ( !f )
return NULL;
n = mf->bmf_malloc( sizeof(Filter), memctx );
n->f_choice = f->f_choice;
n->f_next = NULL;
switch( f->f_choice ) {
case SLAPD_FILTER_COMPUTED:
n->f_result = f->f_result;
break;
case LDAP_FILTER_PRESENT:
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;
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 ( !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;
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
get_simple_vrFilter(
Operation *op,

2
servers/slapd/overlays/pcache.c
View File

@ -1308,7 +1308,7 @@ pcache_op_search(
struct search_info *si;
Debug( LDAP_DEBUG_TRACE, "QUERY CACHEABLE\n", 0, 0, 0 );
query.filter = str2filter(op->ors_filterstr.bv_val);
query.filter = filter_dup(op->ors_filter, NULL);
add_filter_attrs(op, &query.attrs, &qm->attr_sets[attr_set],
filter_attrs, fattr_cnt, fattr_got_oc);

2
servers/slapd/overlays/syncprov.c
View File

@ -1761,7 +1761,7 @@ syncprov_detach_op( Operation *op, syncops *so, slap_overinst *on )
op2->ors_filterstr.bv_val = ptr;
strcpy( ptr, so->s_filterstr.bv_val );
op2->ors_filterstr.bv_len = so->s_filterstr.bv_len;
op2->ors_filter = str2filter( ptr );
op2->ors_filter = filter_dup( op->ors_filter, NULL );
so->s_op = op2;
/* Copy any cached group ACLs individually */

1
servers/slapd/proto-slap.h
View File

@ -898,6 +898,7 @@ LDAP_SLAPD_F (void) filter_free LDAP_P(( Filter *f ));
LDAP_SLAPD_F (void) filter_free_x LDAP_P(( Operation *op, Filter *f ));
LDAP_SLAPD_F (void) filter2bv LDAP_P(( Filter *f, struct berval *bv ));
LDAP_SLAPD_F (void) filter2bv_x LDAP_P(( Operation *op, Filter *f, struct berval *bv ));
LDAP_SLAPD_F (Filter *) filter_dup LDAP_P(( Filter *f, void *memctx ));
LDAP_SLAPD_F (int) get_vrFilter LDAP_P(( Operation *op, BerElement *ber,
ValuesReturnFilter **f,