Commit b32bb6e2 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#5409 fix from HEAD

parent e40b77d2
......@@ -1221,20 +1221,6 @@ parse_paged_cookie( Operation *op, SlapReply *rs )
goto done;
}
} else {
/* Initial request. Initialize state. */
#if 0
if ( op->o_conn->c_pagedresults_state.ps_cookie != 0 ) {
/* There's another pagedResults control on the
* same connection; reject new pagedResults controls
* (allowed by RFC2696) */
rs->sr_text = "paged results cookie unavailable; try later";
rc = LDAP_UNWILLING_TO_PERFORM;
goto done;
}
#endif
ps->ps_cookie = 0;
ps->ps_count = 0;
}
done:;
......
......@@ -1001,6 +1001,10 @@ static int parsePagedResults (
*ps = op->o_conn->c_pagedresults_state;
ps->ps_size = size;
op->o_pagedresults_state = ps;
if ( !cookie.bv_len ) {
ps->ps_count = 0;
ps->ps_cookie = 0;
}
/* NOTE: according to RFC 2696 3.:
......
Markdown is supported
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