isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sudo_ldap_set_options_global() should not take an LDAP handle as

Browse Source 
an argument since the options affect the global settings.
This commit is contained in:
Todd C. Miller
2012-04-23 19:56:41 -04:00
parent 5f513b8326
commit f6c7ae2519
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/sudoers/ldap.c
View File

@@ -1952,7 +1952,7 @@ sudo_ldap_set_options_table(LDAP *ld, struct ldap_config_table *table)
* Set LDAP options based on the global config table. * Set LDAP options based on the global config table.
*/ */
static int static int
sudo_ldap_set_options_global(LDAP *ld) sudo_ldap_set_options_global(void)
{ {
int rc; int rc;
debug_decl(sudo_ldap_set_options_global, SUDO_DEBUG_LDAP) debug_decl(sudo_ldap_set_options_global, SUDO_DEBUG_LDAP)
@@ -1964,7 +1964,7 @@ sudo_ldap_set_options_global(LDAP *ld)
#endif #endif
/* Parse global LDAP options table. */ /* Parse global LDAP options table. */
rc = sudo_ldap_set_options_table(ld, ldap_conf_global); rc = sudo_ldap_set_options_table(NULL, ldap_conf_global);
if (rc == -1) if (rc == -1)
debug_return_int(-1); debug_return_int(-1);
debug_return_int(0); debug_return_int(0);
@@ -2200,7 +2200,7 @@ sudo_ldap_open(struct sudo_nss *nss)
} }
/* Set global LDAP options */ /* Set global LDAP options */
if (sudo_ldap_set_options_global(ld) < 0) if (sudo_ldap_set_options_global() < 0)
debug_return_int(-1); debug_return_int(-1);
/* Connect to LDAP server */ /* Connect to LDAP server */