upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-08 08:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9825 dynlist: don't lose earlier filter elements

Browse source
This commit is contained in:
Howard Chu 2022-04-21 15:40:14 +01:00 committed by Quanah Gibson-Mount
parent 1f5f97d69e
commit c2d546704b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
servers/slapd/overlays/dynlist.c
View file

@ -1208,13 +1208,16 @@ dynlist_filter_stgroup( Operation *op, Filter *n, Attribute *a )
Filter *dnf, *orf = NULL;
int i;
if ( a->a_numvals == 1 ) {
if ( a->a_numvals == 1 && n->f_choice == SLAPD_FILTER_COMPUTED ) {
dnf = n;
} else {
orf = n;
orf->f_choice = LDAP_FILTER_OR;
if ( n->f_choice != LDAP_FILTER_OR ) {
orf->f_choice = LDAP_FILTER_OR;
orf->f_list = NULL;
}
dnf = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx );
dnf->f_next = NULL;
dnf->f_next = orf->f_list;
orf->f_list = dnf;
}
@ -1298,9 +1301,9 @@ dynlist_filter_dup( Operation *op, Filter *f, AttributeDescription *ad, dynlist_
break;
case LDAP_FILTER_EQUALITY:
n->f_choice = SLAPD_FILTER_COMPUTED;
if ( f->f_av_desc == ad ) {
dynlist_name_t *dyn = ldap_tavl_find( ds->ds_names, &f->f_av_value, dynlist_avl_cmp );
n->f_choice = SLAPD_FILTER_COMPUTED;
if ( dyn && !dynlist_filter_group( op, dyn, n, ds ))
break;
}