Add NETWORK_TIMEOUT as an alias for BIND_TIMELIMIT for compatibility

with OpenLDAP ldap.conf files.

diff --git a/NEWS b/NEWS
index de2fe9ebbe5696890fa8a33386e5323642a258ea..8529481202563c67d760616d79654044df671808 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -73,6 +73,9 @@ What's new in Sudo 1.7.5?
  * Fixed a crash when the -g flag was used without the -u flag and
    a sudoers entry did not contain a Runas_Spec.
 
+ * NETWORK_TIMEOUT is now an alias for BIND_TIMELIMIT in ldap.conf for
+   compatibility with OpenLDAP configuration files.
+
 What's new in Sudo 1.7.4p4?
 
  * A potential security issue has been fixed with respect to the handling

diff --git a/doc/sudoers.ldap.pod b/doc/sudoers.ldap.pod
index 6341b16a9726e4dc4ec1bc37c5a84f2e3001b6ac..89409cb7bbb9d4c18af153a6c4dd4d4c4ad9b489 100644 (file)
--- a/doc/sudoers.ldap.pod
+++ b/doc/sudoers.ldap.pod
@@ -326,6 +326,10 @@ to wait while trying to connect to an LDAP server.  If multiple B<URI>s or
 B<HOST>s are specified, this is the amount of time to wait before trying
 the next one in the list.
 
+=item B<NETWORK_TIMEOUT> seconds
+
+An alias for B<BIND_TIMELIMIT>.
+
 =item B<TIMELIMIT> seconds
 
 The B<TIMELIMIT> parameter specifies the amount of time, in seconds,

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index a1091c7565b0cb8a7150e459ddb681052b235cbb..85020fdedb164a45bcc81b8e057fdaa8818fa0df 100644 (file)
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -261,9 +261,13 @@ static struct ldap_config_table ldap_conf_table[] = {
 #ifdef LDAP_OPT_NETWORK_TIMEOUT
     { "bind_timelimit", CONF_INT, TRUE, -1 /* needs timeval, set manually */,
        &ldap_conf.bind_timelimit },
+    { "network_timeout", CONF_INT, TRUE, -1 /* needs timeval, set manually */,
+       &ldap_conf.bind_timelimit },
 #elif defined(LDAP_X_OPT_CONNECT_TIMEOUT)
     { "bind_timelimit", CONF_INT, TRUE, LDAP_X_OPT_CONNECT_TIMEOUT,
        &ldap_conf.bind_timelimit },
+    { "network_timeout", CONF_INT, TRUE, LDAP_X_OPT_CONNECT_TIMEOUT,
+       &ldap_conf.bind_timelimit },
 #endif
     { "timelimit", CONF_INT, TRUE, LDAP_OPT_TIMELIMIT, &ldap_conf.timelimit },
     { "binddn", CONF_STR, FALSE, -1, &ldap_conf.binddn },