mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix braindead config option (mostly harmless)

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-04-15 20:27:43 +00:00
parent 9962894c58
commit 6624f68725
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/man/man5/slapd.conf.5
View File

@ -1132,19 +1132,17 @@ of entries to be returned.
However, the size limit applies to the total count of entries returned within
the search, and not to a single page.
Additional size limits may be enforced; the syntax is
.BR size.pr={<integer>|noEstimate|disabled|none} ,
.BR size.pr={<integer>|noEstimate|none} ,
where
.B integer
is the max page size if no explicit limit is set; the keyword
.I noEstimate
inhibits the server to return an estimate of the total number
of entries that will be returned; the keyword
.I disabled
disables the control, i.e. no paged results can be returned; the keyword
.I none
indicates that no limit is applied to the pagedResults control page size.
The syntax
.B size.prtotal={<integer>|none}
.B size.prtotal={<integer>|none|disabled}
allows to set a limit on the total number of entries that a pagedResults
control allows to return.
By default it is set to the
@ -1158,7 +1156,9 @@ Use
.B none
to allow unlimited number of entries to be returned, i.e. to use
pagedResults as a means to allow clients to circumvent size limitations
on regular searches.
on regular searches; the keyword
.I disabled
disables the control, i.e. no paged results can be returned.
Note that the total number of entries returned when the pagedResults control
is requested cannot exceed the
.B hard

6
servers/slapd/limits.c
View File

@ -809,9 +809,6 @@ limits_parse_one(
} else if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_pr = -1;
} else if ( strcasecmp( arg, "disabled" ) == 0 ) {
limit->lms_s_pr_total = -2;
} else {
char *next = NULL;
int pr = strtol( arg, &next, 10 );
@ -837,6 +834,9 @@ limits_parse_one(
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_pr_total = -1;
} else if ( strcasecmp( arg, "disabled" ) == 0 ) {
limit->lms_s_pr_total = -2;
} else if ( strcasecmp( arg, "hard" ) == 0 ) {
limit->lms_s_pr_total = 0;