import ITS#4718 fix from HEAD

diff --git a/CHANGES b/CHANGES
index 0a6e7f1fb76541b964e1c1fb45d9f849cd80feb3..a24bb4b817147a70ae4d2ba7a6bf40abe263a16e 100644 (file)
--- 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 349939953dcfe951a01932cc6b9aa6d0238bb6e5..fa1edc7d9848fba41a26dd3f9b940d6d7a37e106 100644 (file)
--- 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 9f5b606482dfb193eccbfb06fb663a2c684a02c0..82cb4f32d87d9b8cea328c761239def5480c7c10 100644 (file)
--- 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