Use network-timeout instead

diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 97400d3777e39f5533048bd2795aa4e51a2d323f..6c080725ce97f10c9d3ef8539a17814dcd016339 100644 (file)
--- 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=<limit>]
 .B [timelimit=<limit>]
 .B [schemachecking=on|off]
-.B [network_timeout=<seconds>]
+.B [network-timeout=<seconds>]
 .B [timeout=<seconds>]
 .B [bindmethod=simple|sasl]
 .B [binddn=<dn>]
@@ -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 0c4ae955dec31dc8ddeafaa963a36e1b6cb19704..18fa6b01f234b1bd0459993ce62a4f4a8365d468 100644 (file)
--- 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=<limit>]
 .B [timelimit=<limit>]
 .B [schemachecking=on|off]
-.B [network_timeout=<seconds>]
+.B [network-timeout=<seconds>]
 .B [timeout=<seconds>]
 .B [bindmethod=simple|sasl]
 .B [binddn=<dn>]
@@ -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 78fa9a5c97b62ce01de9183047bc8fa5cd90bc18..368fb9cef62c883dc787c326587b274d98285cb2 100644 (file)
--- 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 },