From 81469d0ff117bca8b9c04ba9ad583c62125a24a7 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 8 Apr 2010 19:51:18 +0000
Subject: [PATCH] more on ITS#6507

---
 servers/slapd/back-bdb/search.c |  3 +++
 servers/slapd/backglue.c        | 23 +++++++++--------------
 servers/slapd/controls.c        |  2 ++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 3a29064538..4e22809a04 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -1262,6 +1262,9 @@ parse_paged_cookie( Operation *op, SlapReply *rs )
 			goto done;
 		}
 
+	} else {
+		/* we're going to use ps_cookie */
+		op->o_conn->c_pagedresults_state.ps_cookie = 0;
 	}
 
 done:;
diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 8911f1595e..7c6de8fd6a 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -549,12 +549,15 @@ glue_op_search ( Operation *op, SlapReply *rs )
 					 * from here on a subsequent request.
 					 */
 					if ( rs->sr_nentries >= ps->ps_size ) {
+						PagedResultsState *cps = &op->o_conn->c_pagedresults_state;
+						
 						/* Don't bother to remember the first backend.
 						 * Only remember the last one if there's more state left.
 						 */
 						if ( op->o_bd != b0 &&
-							( !BER_BVISNULL( &op->o_conn->c_pagedresults_state.ps_cookieval ) ||
-							op->o_bd != gi->gi_n[0].gn_be ))
+							( cps->ps_cookie != NOID
+								|| !BER_BVISNULL( &cps->ps_cookieval )
+								|| op->o_bd != gi->gi_n[0].gn_be ) )
 						{
 							op->o_conn->c_pagedresults_state.ps_be = op->o_bd;
 						}
@@ -562,9 +565,7 @@ glue_op_search ( Operation *op, SlapReply *rs )
 						/* Check whether the cookie is empty,
 						 * and give remaining databases a chance
 						 */
-						if ( op->o_bd != gi->gi_n[0].gn_be ||
-							BER_BVISNULL( &op->o_conn->c_pagedresults_state.ps_cookieval ) )
-						{
+						if ( op->o_bd != gi->gi_n[0].gn_be || cps->ps_cookie == NOID ) {
 							int		c;
 
 							for ( c = 0; gs.ctrls[c] != NULL; c++ ) {
@@ -620,7 +621,7 @@ glue_op_search ( Operation *op, SlapReply *rs )
 
 									ber_free_buf( ber );
 
-								} else if ( op->o_bd != gi->gi_n[0].gn_be ) {
+								} else if ( !BER_BVISEMPTY( &cookie ) && op->o_bd != b0 ) {
 									/* if cookie not empty, it's again this database's turn */
 									op->o_conn->c_pagedresults_state.ps_be = op->o_bd;
 								}
@@ -635,14 +636,8 @@ glue_op_search ( Operation *op, SlapReply *rs )
 					 * next backend will start up properly. Only back-[bh]db
 					 * and back-sql look at this state info.
 					 */
-					if ( ps->ps_cookieval.bv_len == sizeof( PagedResultsCookie )) {
-						ps->ps_cookie = (PagedResultsCookie)0;
-#if 0
-						memset( ps->ps_cookieval.bv_val, 0,
-							sizeof( PagedResultsCookie ));
-#endif
-						BER_BVZERO( &ps->ps_cookieval );
-					}
+					ps->ps_cookie = (PagedResultsCookie)0;
+					BER_BVZERO( &ps->ps_cookieval );
 
 					{
 						/* change the size of the page in the request
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 5d877ab683..f8170df43f 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1234,6 +1234,8 @@ static int parsePagedResults (
 	if ( !cookie.bv_len ) {
 		ps->ps_count = 0;
 		ps->ps_cookie = 0;
+		/* taint ps_cookie, to detect whether it's set */
+		op->o_conn->c_pagedresults_state.ps_cookie = NOID;
 	}
 
 	/* NOTE: according to RFC 2696 3.:
-- 
2.39.5