mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 18:08:23 +00:00
Code Issues Releases Wiki Activity

Add NETWORK_TIMEOUT as an alias for BIND_TIMELIMIT for compatibility

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -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 * Fixed a crash when the -g flag was used without the -u flag and
a sudoers entry did not contain a Runas_Spec. 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? What's new in Sudo 1.7.4p4?
* A potential security issue has been fixed with respect to the handling * A potential security issue has been fixed with respect to the handling

4
doc/sudoers.ldap.pod
View File

@ -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 B<HOST>s are specified, this is the amount of time to wait before trying
the next one in the list. the next one in the list.
=item B<NETWORK_TIMEOUT> seconds
An alias for B<BIND_TIMELIMIT>.
=item B<TIMELIMIT> seconds =item B<TIMELIMIT> seconds
The B<TIMELIMIT> parameter specifies the amount of time, in seconds, The B<TIMELIMIT> parameter specifies the amount of time, in seconds,

4
plugins/sudoers/ldap.c
View File

@ -261,9 +261,13 @@ static struct ldap_config_table ldap_conf_table[] = {
#ifdef LDAP_OPT_NETWORK_TIMEOUT #ifdef LDAP_OPT_NETWORK_TIMEOUT
{ "bind_timelimit", CONF_INT, TRUE, -1 /* needs timeval, set manually */, { "bind_timelimit", CONF_INT, TRUE, -1 /* needs timeval, set manually */,
&ldap_conf.bind_timelimit }, &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) #elif defined(LDAP_X_OPT_CONNECT_TIMEOUT)
{ "bind_timelimit", CONF_INT, TRUE, LDAP_X_OPT_CONNECT_TIMEOUT, { "bind_timelimit", CONF_INT, TRUE, LDAP_X_OPT_CONNECT_TIMEOUT,
&ldap_conf.bind_timelimit }, &ldap_conf.bind_timelimit },
{ "network_timeout", CONF_INT, TRUE, LDAP_X_OPT_CONNECT_TIMEOUT,
&ldap_conf.bind_timelimit },
#endif #endif
{ "timelimit", CONF_INT, TRUE, LDAP_OPT_TIMELIMIT, &ldap_conf.timelimit }, { "timelimit", CONF_INT, TRUE, LDAP_OPT_TIMELIMIT, &ldap_conf.timelimit },
{ "binddn", CONF_STR, FALSE, -1, &ldap_conf.binddn }, { "binddn", CONF_STR, FALSE, -1, &ldap_conf.binddn },