From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Thu, 9 Nov 2023 15:55:53 +0000 (+0000)
Subject: ITS#10129 Fix lloadd.conf manpage
X-Git-Tag: OPENLDAP_REL_ENG_2_5_17~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fdcf120287fde00bef8c28b9625309126dfd8d2;p=thirdparty%2Fopenldap.git

ITS#10129 Fix lloadd.conf manpage
---

diff --git a/doc/man/man5/lloadd.conf.5 b/doc/man/man5/lloadd.conf.5
index 49c72b9bb6..50269b3371 100644
--- a/doc/man/man5/lloadd.conf.5
+++ b/doc/man/man5/lloadd.conf.5
@@ -598,7 +598,16 @@ option. The authentication configuration is shared between them.
 .B [secprops=<properties>]
 .B [timeout=<seconds>]
 .B [network\-timeout=<seconds>]
+.B [keepalive=<idle>:<probes>:<interval>]
 .B [tcp\-user\-timeout=<milliseconds>]
+.B [tls_cert=<file>]
+.B [tls_key=<file>]
+.B [tls_cacert=<file>]
+.B [tls_cacertdir=<path>]
+.B [tls_reqcert=never|allow|try|demand]
+.B [tls_cipher_suite=<ciphers>]
+.B [tls_crlcheck=none|peer|all]
+.B [tls_protocol_min=<major>[.<minor>]]
 
 Specifies the bind credentials
 .B lloadd
@@ -657,6 +666,23 @@ Bind request to complete.
 Timeout set to 0 means no timeout is in effect and by default, no timeouts are
 in effect.
 
+The
+.B keepalive
+parameter sets the values of \fIidle\fP, \fIprobes\fP, and \fIinterval\fP
+used to check whether a socket is alive;
+.I idle
+is the number of seconds a connection needs to remain idle before TCP
+starts sending keepalive probes;
+.I probes
+is the maximum number of keepalive probes TCP should send before dropping
+the connection;
+.I interval
+is interval in seconds between individual keepalive probes.
+Only some systems support the customization of these values;
+the
+.B keepalive
+parameter is ignored otherwise, and system-wide settings are used.
+
 The
 .B tcp\-user\-timeout
 parameter, if non-zero, corresponds to the
@@ -671,16 +697,7 @@ ignored otherwise and system-wide settings are used.
 .B backend-server
 .B uri=ldap[s]://<hostname>[:port]
 .B [retry=<retry interval in ms>]
-.B [keepalive=<idle>:<probes>:<interval>]
 .B [starttls=yes|critical]
-.B [tls_cert=<file>]
-.B [tls_key=<file>]
-.B [tls_cacert=<file>]
-.B [tls_cacertdir=<path>]
-.B [tls_reqcert=never|allow|try|demand]
-.B [tls_cipher_suite=<ciphers>]
-.B [tls_crlcheck=none|peer|all]
-.B [tls_protocol_min=<major>[.<minor>]]
 .B [numconns=<conns>]
 .B [bindconns=<conns>]
 .B [max-pending-ops=<ops>]
@@ -724,23 +741,6 @@ connections,
 .BR 0 ,
 the default, means no limit will be imposed for this backend.
 
-The
-.B keepalive
-parameter sets the values of \fIidle\fP, \fIprobes\fP, and \fIinterval\fP
-used to check whether a socket is alive;
-.I idle
-is the number of seconds a connection needs to remain idle before TCP
-starts sending keepalive probes;
-.I probes
-is the maximum number of keepalive probes TCP should send before dropping
-the connection;
-.I interval
-is interval in seconds between individual keepalive probes.
-Only some systems support the customization of these values;
-the
-.B keepalive
-parameter is ignored otherwise, and system-wide settings are used.
-
 The
 .B starttls
 parameter specifies use of the StartTLS extended operation