upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9426 dynlist: don't add unexpanded groups at end of search

Browse source 
if pagedResults is in use
This commit is contained in:
Howard Chu 2020-12-15 22:55:47 +00:00
parent d2936fb1d5
commit 354e678ce9
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/man/man5/slapo-dynlist.5
View file

@ -263,6 +263,11 @@ The
.BR slapo\-dynlist (5) .BR slapo\-dynlist (5)
overlay supports dynamic configuration via overlay supports dynamic configuration via
.BR back-config . .BR back-config .
.SH BUGS
Filtering on dynamic groups may return incomplete results if the
search operation uses the \fIpagedResults\fP control.
.SH ACKNOWLEDGEMENTS .SH ACKNOWLEDGEMENTS
.P .P
This module was written in 2004 by Pierangelo Masarati for SysNet s.n.c. This module was written in 2004 by Pierangelo Masarati for SysNet s.n.c.

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

@ -350,6 +350,7 @@ dynlist_urlmembers( Operation *op, dynlist_name_t *dyn, slap_callback *sc )
o.ors_tlimit = SLAP_NO_LIMIT; o.ors_tlimit = SLAP_NO_LIMIT;
o.ors_slimit = SLAP_NO_LIMIT; o.ors_slimit = SLAP_NO_LIMIT;
o.ors_attrs = NULL; o.ors_attrs = NULL;
memset( o.o_ctrlflag, 0, sizeof( o.o_ctrlflag ));
o.o_callback = sc; o.o_callback = sc;
for (i=0; i<dyn->dy_numuris; i++) { for (i=0; i<dyn->dy_numuris; i++) {
@ -547,6 +548,7 @@ dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli, dynlis
o.ors_limit = NULL; o.ors_limit = NULL;
o.ors_tlimit = SLAP_NO_LIMIT; o.ors_tlimit = SLAP_NO_LIMIT;
o.ors_slimit = SLAP_NO_LIMIT; o.ors_slimit = SLAP_NO_LIMIT;
memset( o.o_ctrlflag, 0, sizeof( o.o_ctrlflag ));
for ( url = a->a_nvals; !BER_BVISNULL( url ); url++ ) { for ( url = a->a_nvals; !BER_BVISNULL( url ); url++ ) {
LDAPURLDesc *lud = NULL; LDAPURLDesc *lud = NULL;
@ -1534,6 +1536,9 @@ dynlist_search2resp( Operation *op, SlapReply *rs )
SlapReply r = *rs; SlapReply r = *rs;
Filter *f = ds->ds_origfilter ? ds->ds_origfilter : op->ors_filter; Filter *f = ds->ds_origfilter ? ds->ds_origfilter : op->ors_filter;
if ( get_pagedresults( op ) > SLAP_CONTROL_IGNORED )
return SLAP_CB_CONTINUE;
/* Check for any unexpanded dynamic group entries that weren't picked up /* Check for any unexpanded dynamic group entries that weren't picked up
* by the original search filter. * by the original search filter.
*/ */
@ -1677,6 +1682,7 @@ dynlist_search( Operation *op, SlapReply *rs )
sc->sc_private = (void *)(sc+1); sc->sc_private = (void *)(sc+1);
ds = sc->sc_private; ds = sc->sc_private;
memset( o.o_ctrlflag, 0, sizeof( o.o_ctrlflag ));
o.o_managedsait = SLAP_CONTROL_CRITICAL; o.o_managedsait = SLAP_CONTROL_CRITICAL;
/* Are we using memberOf, and does it affect this request? */ /* Are we using memberOf, and does it affect this request? */