ITS#6127

diff --git a/CHANGES b/CHANGES
index 772e633677b775ac7be1b8dcd492a2523b1db3c3..665aa68a9c6bd0cf43c3345bc6d463823635b04b 100644 (file)
--- 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 cd3f6c340dcd0de33347a8e8834380d63d9ab8d6..e4b43af6b0548712bf96db9ac64dfd52b946806f 100644 (file)
--- 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