From bd975514dee538bc1402a1f7c8bea9bc56e9241a Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 12 Dec 2005 15:57:58 +0000 Subject: [PATCH] add (and document) customizable bind-timeout --- doc/man/man5/slapd-meta.5 | 161 ++++++++++++++++------------ servers/slapd/back-meta/back-meta.h | 6 +- servers/slapd/back-meta/bind.c | 6 +- servers/slapd/back-meta/config.c | 38 ++++++- servers/slapd/back-meta/init.c | 2 + 5 files changed, 134 insertions(+), 79 deletions(-) diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5 index e900ea8104..806f130f75 100644 --- a/doc/man/man5/slapd-meta.5 +++ b/doc/man/man5/slapd-meta.5 @@ -90,21 +90,15 @@ This directive can also be used when processing targets to mark a specific target as default. .TP -.B dncache-ttl {forever|disabled|} +.B dncache-ttl {DISABLED|forever|} This directive sets the time-to-live of the DN cache. This caches the target that holds a given DN to speed up target selection in case multiple targets would result from an uncached search; forever means cache never expires; disabled means no DN -caching; otherwise a valid ( > 0 ) ttl in seconds is required. - -.TP -.B nretries {forever|never|} -This directive defines how many times a bind should be retried -in case of temporary failure in contacting a target. If defined -before any target specification, it applies to all targets (by default, -.BR never ); -the global value can be overridden by redefinitions inside each target -specification. +caching; otherwise a valid ( > 0 ) ttl is required, in the format +illustrated for the +.B idle-timeout +directive. .TP .B onerr {CONTINUE|stop} @@ -116,6 +110,13 @@ If this statement is set to \fBstop\fP, the search is terminated as soon as an error is returned by one target, and the error is immediately propagated to the client. +.TP +.B pseudoroot-bind-defer {NO|yes} +This directive, when set to +.BR yes , +causes the authentication to the remote servers with the pseudo-root +identity to be deferred until actually needed by subsequent operations. + .TP .B rebind-as-user {NO|yes} If this option is given, the client's bind credentials are remembered @@ -168,14 +169,6 @@ causes \fIl2.foo.com\fP to be contacted whenever \fIl1.foo.com\fP does not respond. .RE -.TP -.B default-target [] -The "default-target" directive can also be used during target specification. -With no arguments it marks the current target as the default. -The optional number marks target as the default one, starting -from 1. -Target must be defined. - .TP .B acl-authcDN "" DN which is used to query the target server for acl checking, @@ -193,6 +186,20 @@ Password used with the acl-authcDN above. +.TP +.B bind-timeout +This directive defines the timeout, in microseconds, used when polling +for response after an asynchronous bind connection. The initial call +to ldap_result(3) is performed with a trade-off timeout of 100000 us; +if that results in a timeout exceeded, subsequent calls use the value +provided with +.BR bind-timeout . +The default value is used also for subsequent calls if +.B bind-timeout +is not specified. +If set before any target specification, it affects all targets, unless +overridden by any per-target directive. + .TP .B chase-referrals {YES|no} enable/disable automatic referral chasing, which is delegated to the @@ -202,48 +209,41 @@ If set before any target specification, it affects all targets, unless overridden by any per-target directive. .TP -.B tls {[try-]start|[try-]propagate} -execute the start TLS extended operation when the connection is initialized; -only works if the URI directive protocol scheme is not \fBldaps://\fP. -\fBpropagate\fP issues the Start TLS exop only if the original -connection did. -The \fBtry-\fP prefix instructs the proxy to continue operations -if start TLS failed; its use is highly deprecated. -If set before any target specification, it affects all targets, unless -overridden by any per-target directive. +.B default-target [] +The "default-target" directive can also be used during target specification. +With no arguments it marks the current target as the default. +The optional number marks target as the default one, starting +from 1. +Target must be defined. .TP -.B t-f-support {NO|yes|discover} -enable if the remote server supports absolute filters -(see \fIdraft-zeilenga-ldap-t-f\fP for details). -If set to -.BR discover , -support is detected by reading the remote server's root DSE. +.B idle-timeout