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

slapi_filter_dup() can now use filter_dup()

Browse Source
This commit is contained in:
Luke Howard 2006-01-23 21:23:36 +00:00
parent 51c5916149
commit 0c0abfe917
1 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
servers/slapd/slapi/slapi_utils.c
View File

@ -1478,77 +1478,7 @@ slapi_filter_free(
Slapi_Filter *
slapi_filter_dup( Slapi_Filter *filter )
{
Filter *f;
f = (Filter *) slapi_ch_malloc( sizeof(Filter) );
f->f_next = NULL;
f->f_choice = filter->f_choice;
switch ( f->f_choice ) {
case LDAP_FILTER_AND:
case LDAP_FILTER_NOT:
case LDAP_FILTER_OR: {
Filter *pFilter, **ppF;
for ( pFilter = filter->f_list, ppF = &f->f_list;
pFilter != NULL;
pFilter = pFilter->f_next, ppF = &f->f_next )
{
*ppF = slapi_filter_dup( pFilter );
if ( *ppF == NULL )
break;
}
break;
}
case LDAP_FILTER_PRESENT:
f->f_desc = filter->f_desc;
break;
case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_GE:
case LDAP_FILTER_LE:
case LDAP_FILTER_APPROX:
f->f_ava = (AttributeAssertion *)slapi_ch_malloc( sizeof(AttributeAssertion) );
f->f_ava->aa_desc = filter->f_ava->aa_desc;
ber_dupbv( &f->f_ava->aa_value, &filter->f_ava->aa_value );
break;
case LDAP_FILTER_EXT:
f->f_mra = (MatchingRuleAssertion *)slapi_ch_malloc( sizeof(MatchingRuleAssertion) );
f->f_mra->ma_rule = filter->f_mra->ma_rule;
f->f_mra->ma_rule_text = filter->f_mra->ma_rule_text; /* struct copy */
f->f_mra->ma_desc = filter->f_mra->ma_desc;
f->f_mra->ma_dnattrs = filter->f_mra->ma_dnattrs;
ber_dupbv( &f->f_mra->ma_value, &filter->f_mra->ma_value );
break;
case LDAP_FILTER_SUBSTRINGS: {
int i;
f->f_sub = (SubstringsAssertion *)slapi_ch_malloc( sizeof(SubstringsAssertion) );
f->f_sub->sa_desc = filter->f_sub->sa_desc;
ber_dupbv( &f->f_sub_initial, &filter->f_sub_initial );
if ( filter->f_sub_any != NULL ) {
for ( i = 0; filter->f_sub_any[i].bv_val != NULL; i++ )
;
f->f_sub_any = (BerVarray)slapi_ch_malloc( (i + 1) * (sizeof(struct berval)) );
for ( i = 0; filter->f_sub_any[i].bv_val != NULL; i++ ) {
ber_dupbv( &f->f_sub_any[i], &filter->f_sub_any[i] );
}
f->f_sub_any[i].bv_val = NULL;
} else {
f->f_sub_any = NULL;
}
ber_dupbv( &f->f_sub_final, &filter->f_sub_final );
break;
}
case SLAPD_FILTER_COMPUTED:
f->f_result = filter->f_result;
break;
default:
slapi_ch_free( (void **)&f );
f = NULL;
break;
}
return f;
return filter_dup( filter, NULL );
}
int