From db693093a120bd0ee57e59e108da88ede9e6fcb6 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 9 May 2008 00:08:19 +0000 Subject: [PATCH] Use network-timeout instead --- doc/man/man5/slapd-config.5 | 4 ++-- doc/man/man5/slapd.conf.5 | 4 ++-- servers/slapd/config.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5 index 97400d3777..6c080725ce 100644 --- a/doc/man/man5/slapd-config.5 +++ b/doc/man/man5/slapd-config.5 @@ -1585,7 +1585,7 @@ with the inner suffix must come first in the configuration file. .B [sizelimit=] .B [timelimit=] .B [schemachecking=on|off] -.B [network_timeout=] +.B [network-timeout=] .B [timeout=] .B [bindmethod=simple|sasl] .B [binddn=] @@ -1690,7 +1690,7 @@ consumer site by turning on the parameter. The default is off. The -.B network_timeout +.B network-timeout parameter sets how long the consumer will wait to establish a network connection to the provider. Once a connection is established, the diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 0c4ae955de..18fa6b01f2 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -1522,7 +1522,7 @@ in order to work over all of the glued databases. E.g. .B [sizelimit=] .B [timelimit=] .B [schemachecking=on|off] -.B [network_timeout=] +.B [network-timeout=] .B [timeout=] .B [bindmethod=simple|sasl] .B [binddn=] @@ -1636,7 +1636,7 @@ As a consequence, schema checking should be \fBoff\fP when partial replication is used. The -.B network_timeout +.B network-timeout parameter sets how long the consumer will wait to establish a network connection to the provider. Once a connection is established, the diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 78fa9a5c97..368fb9cef6 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1179,7 +1179,7 @@ static slap_cf_aux_table bindkey[] = { { BER_BVC("version="), offsetof(slap_bindconf, sb_version), 'i', 0, versionkey }, { BER_BVC("bindmethod="), offsetof(slap_bindconf, sb_method), 'i', 0, methkey }, { BER_BVC("timeout="), offsetof(slap_bindconf, sb_timeout_api), 'i', 0, NULL }, - { BER_BVC("network_timeout="), offsetof(slap_bindconf, sb_timeout_net), 'i', 0, NULL }, + { BER_BVC("network-timeout="), offsetof(slap_bindconf, sb_timeout_net), 'i', 0, NULL }, { BER_BVC("binddn="), offsetof(slap_bindconf, sb_binddn), 'b', 1, (slap_verbmasks *)dnNormalize }, { BER_BVC("credentials="), offsetof(slap_bindconf, sb_cred), 'b', 1, NULL }, { BER_BVC("saslmech="), offsetof(slap_bindconf, sb_saslmech), 'b', 0, NULL }, -- 2.39.5