mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

do not assume that someone parsed the paged results response; in case, re-parse (ITS#6507)

Browse Source
This commit is contained in:
Pierangelo Masarati 2010-04-07 00:53:36 +00:00
parent 5da876f5fc
commit de84e6a09d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servers/slapd/backglue.c
View File

@ -553,14 +553,18 @@ glue_op_search ( Operation *op, SlapReply *rs )
* Only remember the last one if there's more state left.
*/
if ( op->o_bd != b0 &&
( op->o_conn->c_pagedresults_state.ps_cookie ||
( !BER_BVISNULL( &op->o_conn->c_pagedresults_state.ps_cookieval ) ||
op->o_bd != gi->gi_n[0].gn_be ))
{
op->o_conn->c_pagedresults_state.ps_be = op->o_bd;
}
/* Check whether the cookie is empty,
* and give remaining databases a chance
*/
if ( op->o_bd != gi->gi_n[0].gn_be ) {
if ( op->o_bd != gi->gi_n[0].gn_be ||
BER_BVISNULL( &op->o_conn->c_pagedresults_state.ps_cookieval ) )
{
int c;
for ( c = 0; gs.ctrls[c] != NULL; c++ ) {
@ -585,8 +589,8 @@ glue_op_search ( Operation *op, SlapReply *rs )
if ( btmp == b0 ) {
op->o_conn->c_pagedresults_state.ps_be = gi->gi_n[gi->gi_nodes - 1].gn_be;
} else if (i > 0 ) {
op->o_conn->c_pagedresults_state.ps_be = gi->gi_n[i - 1].gn_be;
} else {
op->o_conn->c_pagedresults_state.ps_be = gi->gi_n[(i > 0 ? i - 1: 0)].gn_be;
}
/* delete old, create new cookie with NOID */
@ -614,6 +618,9 @@ glue_op_search ( Operation *op, SlapReply *rs )
gs.ctrls[c] = newctrl;
ber_free_buf( ber );
} else {
op->o_conn->c_pagedresults_state.ps_be = op->o_bd;
}
}
}