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

fix attribute list swapping when NULL (ITS#5665)

Browse source
This commit is contained in:
Pierangelo Masarati 2008-08-23 11:08:41 +00:00
parent 0e6054d861
commit c32cbed9ae
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/overlays/pcache.c
View file

@ -1593,6 +1593,7 @@ struct search_info {
Query query; Query query;
QueryTemplate *qtemp; QueryTemplate *qtemp;
AttributeName* save_attrs; /* original attributes, saved for response */ AttributeName* save_attrs; /* original attributes, saved for response */
int swap_saved_attrs;
int max; int max;
int over; int over;
int count; int count;
@ -1984,7 +1985,7 @@ pcache_op_cleanup( Operation *op, SlapReply *rs ) {
if ( rs->sr_type == REP_RESULT || if ( rs->sr_type == REP_RESULT ||
op->o_abandon || rs->sr_err == SLAPD_ABANDON ) op->o_abandon || rs->sr_err == SLAPD_ABANDON )
{ {
if ( si->save_attrs != NULL ) { if ( si->swap_saved_attrs ) {
rs->sr_attrs = si->save_attrs; rs->sr_attrs = si->save_attrs;
op->ors_attrs = si->save_attrs; op->ors_attrs = si->save_attrs;
} }
@ -2067,7 +2068,7 @@ pcache_response(
{ {
struct search_info *si = op->o_callback->sc_private; struct search_info *si = op->o_callback->sc_private;
if ( si->save_attrs != NULL ) { if ( si->swap_saved_attrs ) {
rs->sr_attrs = si->save_attrs; rs->sr_attrs = si->save_attrs;
op->ors_attrs = si->save_attrs; op->ors_attrs = si->save_attrs;
} }
@ -2164,7 +2165,7 @@ add_filter_attrs(
} }
BER_BVZERO( &(*new_attrs)[j].an_name ); BER_BVZERO( &(*new_attrs)[j].an_name );
return count; return j;
} }
/* NOTE: this is a quick workaround to let pcache minimally interact /* NOTE: this is a quick workaround to let pcache minimally interact
@ -2416,6 +2417,7 @@ pcache_op_search(
} }
si->head = NULL; si->head = NULL;
si->tail = NULL; si->tail = NULL;
si->swap_saved_attrs = 1;
si->save_attrs = op->ors_attrs; si->save_attrs = op->ors_attrs;
op->ors_attrs = qtemp->t_attrs.attrs; op->ors_attrs = qtemp->t_attrs.attrs;