ITS#5269 fixes from Guillaume Rousse at inria.fr

[openldap] / doc / man / man5 / slapd-ldap.5

diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index 31760e32710e7771aabe5776bb398fb6ee0943dd..ffade546e290f6d07d3731b70c5766b9bad29736 100644 (file)
--- a/doc/man/man5/slapd-ldap.5
+++ b/doc/man/man5/slapd-ldap.5
@@ -38,11 +38,14 @@ rules; see
 for details.
 
 .LP
-Note: When looping back to the same instance of \fBslapd\fP(8), 
-each connection requires a new thread; as a consequence, \fBslapd\fP(8)
+Note: When looping back to the same instance of
+.BR slapd (8), 
+each connection requires a new thread; as a consequence,
+.BR slapd (8)
 must be compiled with thread support, and the \fBthreads\fP parameter 
 may need some tuning; in those cases, one may consider using 
-\fBslapd-relay\fP(5) instead, which performs the relayed operation 
+.BR slapd-relay (5)
+instead, which performs the relayed operation 
 internally and thus reuses the same connection.
 
 .SH CONFIGURATION
@@ -426,6 +429,13 @@ or when chasing a referral, if
 is set to
 .IR yes .
 
+.TP
+.B session\-tracking\-request {NO|yes}
+Adds session tracking control for all requests.
+The client's IP and hostname, and the identity associated to each request,
+if known, are sent to the remote server for informational purposes.
+This directive is incompatible with setting \fIprotocol\-version\fP to 2.
+
 .TP
 .B single\-conn {NO|yes}
 Discards current cached connection when the client rebinds.
@@ -443,13 +453,15 @@ support is detected by reading the remote server's root DSE.
 This directive allows to set per-operation timeouts.
 Operations can be
 
-\fB<op> ::= bind, add, delete, modrdn, modify, compare\fP
+\fB<op> ::= bind, add, delete, modrdn, modify, compare, search\fP
 
-The \fBsearch\fP operation is already controlled either
+The overall duration of the \fBsearch\fP operation is controlled either
 by the \fBtimelimit\fP parameter or by server-side enforced
 time limits (see \fBtimelimit\fP and \fBlimits\fP in
 .BR slapd.conf (5)
 for details).
+This \fBtimeout\fP parameter controls how long the target can be 
+irresponsive before the operation is aborted.
 Timeout is meaningless for the remaining operations,
 \fBunbind\fP and \fBabandon\fP, which do not imply any response,
 while it is not yet implemented in currently supported \fBextended\fP 
@@ -495,6 +507,7 @@ The TLS settings default to the same as the main slapd TLS settings,
 except for
 .B tls_reqcert
 which defaults to "demand".
+.RE
 
 .TP
 .B use-temporary-conn {NO|yes}