Commit 1714d00a authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5409

parent 3753ee02
...@@ -7,6 +7,7 @@ OpenLDAP 2.4.9 Engineering ...@@ -7,6 +7,7 @@ OpenLDAP 2.4.9 Engineering
Fixed slapd add operations requiring naming attrs (ITS#5412) Fixed slapd add operations requiring naming attrs (ITS#5412)
Fixed slapd frontendDB backend selection (ITS#5419) Fixed slapd frontendDB backend selection (ITS#5419)
Fixed slapd delta-syncrepl resync (ITS#5378) Fixed slapd delta-syncrepl resync (ITS#5378)
Fixed slapd pagedresults stale state (ITS#5409)
Fixed slapd pointer dereference (ITS#5388) Fixed slapd pointer dereference (ITS#5388)
Fixed slapd null argument dereference (ITS#5435) Fixed slapd null argument dereference (ITS#5435)
Fixed slapd sets attribute description parsing (ITS#5402) Fixed slapd sets attribute description parsing (ITS#5402)
......
...@@ -1160,10 +1160,6 @@ parse_paged_cookie( Operation *op, SlapReply *rs ) ...@@ -1160,10 +1160,6 @@ parse_paged_cookie( Operation *op, SlapReply *rs )
goto done; goto done;
} }
} else {
/* Initial request. Initialize state. */
ps->ps_cookie = 0;
ps->ps_count = 0;
} }
done:; done:;
......
...@@ -1102,6 +1102,10 @@ static int parsePagedResults ( ...@@ -1102,6 +1102,10 @@ static int parsePagedResults (
ps->ps_size = size; ps->ps_size = size;
ps->ps_cookieval = cookie; ps->ps_cookieval = cookie;
op->o_pagedresults_state = ps; op->o_pagedresults_state = ps;
if ( !cookie.bv_len ) {
ps->ps_count = 0;
ps->ps_cookie = 0;
}
/* NOTE: according to RFC 2696 3.: /* NOTE: according to RFC 2696 3.:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment