2
0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-30 22:05:46 +00:00

Add NETWORK_TIMEOUT as an alias for BIND_TIMELIMIT for compatibility

with OpenLDAP ldap.conf files.
This commit is contained in:
Todd C. Miller
2011-01-10 09:27:58 -05:00
parent 8a043ca562
commit 823e812723
3 changed files with 11 additions and 0 deletions

View File

@@ -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 },