From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 15 Apr 2008 00:15:00 +0000 (+0000)
Subject: ITS#5409
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~54
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1714d00a07b5d5388d9ecdeb8cec81c0f94fb30f;p=openldap

ITS#5409
---

diff --git a/CHANGES b/CHANGES
index 4b335bf8d5..493091f050 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.4.9 Engineering
 	Fixed slapd add operations requiring naming attrs (ITS#5412)
 	Fixed slapd frontendDB backend selection (ITS#5419)
 	Fixed slapd delta-syncrepl resync (ITS#5378)
+	Fixed slapd pagedresults stale state (ITS#5409)
 	Fixed slapd pointer dereference (ITS#5388)
 	Fixed slapd null argument dereference (ITS#5435)
 	Fixed slapd sets attribute description parsing (ITS#5402)
diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index abe130f550..3bbe0a7abc 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -1160,10 +1160,6 @@ parse_paged_cookie( Operation *op, SlapReply *rs )
 			goto done;
 		}
 
-	} else {
-		/* Initial request.  Initialize state. */
-		ps->ps_cookie = 0;
-		ps->ps_count = 0;
 	}
 
 done:;
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index b7f66eeab2..042fccca8f 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1102,6 +1102,10 @@ static int parsePagedResults (
 	ps->ps_size = size;
 	ps->ps_cookieval = cookie;
 	op->o_pagedresults_state = ps;
+	if ( !cookie.bv_len ) {
+		ps->ps_count = 0;
+		ps->ps_cookie = 0;
+	}
 
 	/* NOTE: according to RFC 2696 3.: