From 3f77ede79a2c2c8531a94c40a8eedec2f13aff26 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 2 Jun 2009 23:56:54 +0000
Subject: [PATCH] ITS#6127
---
CHANGES | 1 +
doc/man/man5/ldap.conf.5 | 15 +++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/CHANGES b/CHANGES
index 772e633677..665aa68a9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@ OpenLDAP 2.4.17 Engineering
Fixed winsock detection for windows (ITS#6102, ITS#6078)
Documentation
admin24 fixed example regex (ITS#6052)
+ ldap.conf(5) improve sizelimit/timelimit limits (ITS#6127)
slapd.conf(5) pidfile/argsfile description fix (ITS#5975)
slapd-config(5) pidfile/argsfile description fix (ITS#5975)
slapo-unique(5) explicitly note rootdn requirement (ITS#6108)
diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index cd3f6c340d..e4b43af6b0 100644
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -186,14 +186,17 @@ Note that the command line tools
.\"Determines whether the library should implicitly restart connections (FIXME).
.TP
.B SIZELIMIT <integer>
-Specifies a size limit to use when performing searches. The
-number should be a non-negative integer. \fISIZELIMIT\fP of zero (0)
-specifies unlimited search size.
+Specifies a size limit (number of entries) to use when performing searches.
+The number should be a non-negative integer. \fISIZELIMIT\fP of zero (0)
+specifies a request for unlimited search size. Please note that the server
+may still apply any server-side limit on the amount of entries that can be
+returned by a search operation.
.TP
.B TIMELIMIT <integer>
-Specifies a time limit to use when performing searches. The
-number should be a non-negative integer. \fITIMELIMIT\fP of zero (0)
-specifies unlimited search time to be used.
+Specifies a time limit (in seconds) to use when performing searches.
+The number should be a non-negative integer. \fITIMELIMIT\fP of zero (0)
+specifies unlimited search time to be used. Please note that the server
+may still apply any server-side limit on the duration of a search operation.
.B VERSION {2|3}
Specifies what version of the LDAP protocol should be used.
.TP
--
GitLab