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

Treat LDAP_OPT_CONNECT_TIMEOUT (Tivoli Directory Server 6.3) the

Browse Source 
same as LDAP_OPT_CONNECT_TIMEOUT (OpenSSH).
Don't make failure to a set an ldap option fatal.
This commit is contained in:
Todd C. Miller
2012-06-28 14:58:15 -04:00
parent 7d5048a5be
commit cfe0034cdf
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/sudoers/ldap.c
View File

@@ -85,6 +85,10 @@
extern int ldapssl_set_strength(LDAP *ldap, int strength); extern int ldapssl_set_strength(LDAP *ldap, int strength);
#endif #endif
#if !defined(LDAP_OPT_NETWORK_TIMEOUT) && defined(LDAP_OPT_CONNECT_TIMEOUT)
# define LDAP_OPT_NETWORK_TIMEOUT LDAP_OPT_CONNECT_TIMEOUT
#endif
#ifndef LDAP_OPT_SUCCESS #ifndef LDAP_OPT_SUCCESS
# define LDAP_OPT_SUCCESS LDAP_SUCCESS # define LDAP_OPT_SUCCESS LDAP_SUCCESS
#endif #endif
@@ -1911,7 +1915,7 @@ static int
sudo_ldap_set_options_table(LDAP *ld, struct ldap_config_table *table) sudo_ldap_set_options_table(LDAP *ld, struct ldap_config_table *table)
{ {
struct ldap_config_table *cur; struct ldap_config_table *cur;
int ival, rc; int ival, rc, errors = 0;
char *sval; char *sval;
debug_decl(sudo_ldap_set_options_table, SUDO_DEBUG_LDAP) debug_decl(sudo_ldap_set_options_table, SUDO_DEBUG_LDAP)
@@ -1924,30 +1928,30 @@ sudo_ldap_set_options_table(LDAP *ld, struct ldap_config_table *table)
case CONF_INT: case CONF_INT:
ival = *(int *)(cur->valp); ival = *(int *)(cur->valp);
if (ival >= 0) { if (ival >= 0) {
DPRINTF(("ldap_set_option: %s -> %d", cur->conf_str, ival), 1);
rc = ldap_set_option(ld, cur->opt_val, &ival); rc = ldap_set_option(ld, cur->opt_val, &ival);
if (rc != LDAP_OPT_SUCCESS) { if (rc != LDAP_OPT_SUCCESS) {
warningx("ldap_set_option: %s -> %d: %s", warningx("ldap_set_option: %s -> %d: %s",
cur->conf_str, ival, ldap_err2string(rc)); cur->conf_str, ival, ldap_err2string(rc));
debug_return_int(-1); errors++;
} }
DPRINTF(("ldap_set_option: %s -> %d", cur->conf_str, ival), 1);
} }
break; break;
case CONF_STR: case CONF_STR:
sval = *(char **)(cur->valp); sval = *(char **)(cur->valp);
if (sval != NULL) { if (sval != NULL) {
DPRINTF(("ldap_set_option: %s -> %s", cur->conf_str, sval), 1);
rc = ldap_set_option(ld, cur->opt_val, sval); rc = ldap_set_option(ld, cur->opt_val, sval);
if (rc != LDAP_OPT_SUCCESS) { if (rc != LDAP_OPT_SUCCESS) {
warningx("ldap_set_option: %s -> %s: %s", warningx("ldap_set_option: %s -> %s: %s",
cur->conf_str, sval, ldap_err2string(rc)); cur->conf_str, sval, ldap_err2string(rc));
debug_return_int(-1); errors++;
} }
DPRINTF(("ldap_set_option: %s -> %s", cur->conf_str, sval), 1);
} }
break; break;
} }
} }
debug_return_int(0); debug_return_int(errors ? -1 : 0);
} }
/* /*