From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 24 Oct 2006 19:51:37 +0000 (+0000)
Subject: import ITS#4718 fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_29~25
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9493174bf9c237cb5ee378d7ab8c640031dae99c;p=openldap

import ITS#4718 fix from HEAD
---

diff --git a/CHANGES b/CHANGES
index 0a6e7f1fb7..a24bb4b817 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.29 Engineering
+	Documentation
+		Fixed slapd-ldap/meta(5) missing network-timeout (ITS#4718)
 
 OpenLDAP 2.3.28 Release
 	Fixed libldap ldap.conf max line length (ITS#4669)
diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index 349939953d..fa1edc7d98 100644
--- a/doc/man/man5/slapd-ldap.5
+++ b/doc/man/man5/slapd-ldap.5
@@ -304,6 +304,16 @@ and
 This directive causes a cached connection to be dropped an recreated
 after it has been idle for the specified time.
 
+.TP
+.B network-timeout <time>
+Sets the network timeout value after which
+.BR poll (2)/ select (2) 
+following a 
+.BR connect (2) 
+returns in case of no activity.
+The value is in seconds, and it can be specified as for
+.BR idle-timeout .
+
 .TP
 .B protocol\-version {0,2,3}
 This directive indicates what protocol version must be used to contact
diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5
index 9f5b606482..82cb4f32d8 100644
--- a/doc/man/man5/slapd-meta.5
+++ b/doc/man/man5/slapd-meta.5
@@ -261,6 +261,18 @@ This maps object classes and attributes as in the LDAP backend.
 See
 .BR slapd-ldap (5).
 
+.TP
+.B network-timeout <time>
+Sets the network timeout value after which
+.BR poll (2)/ select (2) 
+following a 
+.BR connect (2) 
+returns in case of no activity.
+The value is in seconds, and it can be specified as for
+.BR idle-timeout .
+If set before any target specification, it affects all targets, unless
+overridden by any per-target directive.
+
 .TP
 .B nretries {forever|never|<nretries>}
 This directive defines how many times a bind should be retried