Commit d41b35b8 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#9260 - Reference conn-pool-max option in related man pages

parent 539e8105
......@@ -36,10 +36,11 @@ maintains the functionality of
and has a largely similar codebase,
some changes in operation and some new configuration directives have been
added. Some configuration options, such as
.B conn-ttl,
.B single-conn
.B conn\-pool\-max ,
.B conn\-ttl ,
.B single\-conn ,
and
.B use-temporary-conn
.B use\-temporary\-conn
have been removed, as they are no longer relevant.
.LP
.B New connection handling:
......@@ -126,14 +127,14 @@ Specify the number of consecutive timed out requests,
after which the connection will be considered faulty and dropped.
.TP
.B max-pending-ops <number>
.B max\-pending\-ops <number>
The maximum number of pending requests stored in a connection's queue.
The default is 128. When this number is exceeded,
.B LDAP_BUSY
will be returned to the client.
.TP
.B max-target-conns <number>
.B max\-target\-conns <number>
The maximum number of connections per target. Unlike
.B slapd\-meta(5),
no new connections will be created
......@@ -242,8 +243,7 @@ check permissions.
.TP
.B acl\-passwd <password>
Password used with the
.B
acl\-authcDN
.B acl\-authcDN
above.
.TP
......@@ -511,8 +511,8 @@ ETCDIR/slapd.conf
default slapd configuration file
.SH SEE ALSO
.BR slapd.conf (5),
.BR slapd\-meta (5),
.BR slapd\-ldap (5),
.BR slapd\-meta (5),
.BR slapo\-pcache (5),
.BR slapd (8),
.BR regex (7),
......
......@@ -191,6 +191,10 @@ enable/disable automatic referral chasing, which is delegated to the
underlying libldap, with rebinding eventually performed if the
\fBrebind\-as\-user\fP directive is used. The default is to chase referrals.
.TP
.B conn\-pool\-max <int>
This directive defines the maximum size of the privileged connections pool.
.TP
.B conn\-ttl <time>
This directive causes a cached connection to be dropped and recreated
......
......@@ -57,7 +57,7 @@ the same connection.
.SH EXAMPLES
There are examples in various places in this document, as well as in the
slapd/back\-meta/data/ directory in the OpenLDAP source tree.
slapd/back-meta/data/ directory in the OpenLDAP source tree.
.SH CONFIGURATION
These
.B slapd.conf
......@@ -94,6 +94,10 @@ should be defined first for clarity, including those that are common
to all backends.
They are:
.TP
.B conn\-pool\-max <int>
This directive defines the maximum size of the privileged connections pool.
.TP
.B conn\-ttl <time>
This directive causes a cached connection to be dropped an recreated
......@@ -174,7 +178,7 @@ This directive, when set to
.BR yes ,
causes the authentication to the remote servers with the pseudo-root
identity (the identity defined in each
.B idassert-bind
.B idassert\-bind
directive) to be deferred until actually needed by subsequent operations.
Otherwise, all binds as the rootdn are propagated to the targets.
......@@ -284,8 +288,7 @@ check permissions.
.TP
.B acl\-passwd <password>
Password used with the
.B
acl\-authcDN
.B acl\-authcDN
above.
.TP
......@@ -317,7 +320,7 @@ search operations with a specific target,
irrespective of the client's request.
When set to a numeric value, Paged Results control is always
used with \fIsize\fP as the page size.
When set to \fIaccept-unsolicited\fP, unsolicited Paged Results
When set to \fIaccept\-unsolicited\fP, unsolicited Paged Results
control responses are accepted and honored
for compatibility with broken remote DSAs.
The client is not exposed to paged results handling
......@@ -356,7 +359,7 @@ if defined, selects what
.I local
identities are authorized to exploit the identity assertion feature.
The string
.B <authz-regexp>
.B <authz\-regexp>
follows the rules defined for the
.I authzFrom
attribute.
......@@ -1354,6 +1357,7 @@ ETCDIR/slapd.conf
default slapd configuration file
.SH SEE ALSO
.BR slapd.conf (5),
.BR slapd\-asyncmeta (5),
.BR slapd\-ldap (5),
.BR slapo\-pcache (5),
.BR slapd (8),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment