ITS#5409

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)

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:;

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.: