Commit 2a8b9fe5 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5230

parent 4cf57512
......@@ -6,6 +6,7 @@ OpenLDAP 2.4.7 Engineering
Fixed slapd filter normalization (ITS#5212)
Fixed slapd multiple sufix checking (ITS#5186)
Fixed slapd contextCSN updating from old releases (ITS#5225)
Fixed slapd paged results handling when using rootdn (ITS#5230)
Fixed slapo-ppolicy single password check on modify (ITS#5146)
Fixed slapo-syncprov refresh and persist cookie sending (ITS#5210)
Fixed slapo-syncprov ignore invalid cookies (ITS#5211)
......
......@@ -1118,6 +1118,18 @@ limits_check( Operation *op, SlapReply *rs )
op->ors_slimit = SLAP_NO_LIMIT;
}
/* if paged results and slimit are requested */
if ( get_pagedresults( op ) > SLAP_CONTROL_IGNORED &&
op->ors_slimit != SLAP_NO_LIMIT ) {
PagedResultsState *ps = op->o_pagedresults_state;
int total = op->ors_slimit - ps->ps_count;
if ( total > 0 ) {
op->ors_slimit = total;
} else {
op->ors_slimit = 0;
}
}
/* if not root, get appropriate limits */
} else {
( void ) limits_get( op, &op->o_ndn, &op->ors_limit );
......
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