mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 14:55:12 +00:00
Code Issues Releases Wiki Activity

Remove remaining calls to fatalx(); just pass the error to the caller.

Browse Source
This commit is contained in:
Todd C. Miller
2014-03-31 15:43:52 -06:00
parent 2d1484fe84
commit 7d994b5032
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/sudoers/ldap.c
View File

@@ -391,7 +391,7 @@ struct sudo_nss sudo_nss_ldap = {
* ldap_create() does not take a default port parameter so we must * ldap_create() does not take a default port parameter so we must
* append one if we want something other than LDAP_PORT. * append one if we want something other than LDAP_PORT.
*/ */
static void static bool
sudo_ldap_conf_add_ports(void) sudo_ldap_conf_add_ports(void)
{ {
@@ -402,8 +402,10 @@ sudo_ldap_conf_add_ports(void)
hostbuf[0] = '\0'; hostbuf[0] = '\0';
len = snprintf(defport, sizeof(defport), ":%d", ldap_conf.port); len = snprintf(defport, sizeof(defport), ":%d", ldap_conf.port);
if (len <= 0 || (size_t)len >= sizeof(defport)) if (len <= 0 || (size_t)len >= sizeof(defport)) {
fatalx(U_("sudo_ldap_conf_add_ports: port too large")); warningx(U_("sudo_ldap_conf_add_ports: port too large"));
debug_return_bool(false);
}
for ((host = strtok(ldap_conf.host, " \t")); host; (host = strtok(NULL, " \t"))) { for ((host = strtok(ldap_conf.host, " \t")); host; (host = strtok(NULL, " \t"))) {
if (hostbuf[0] != '\0') { if (hostbuf[0] != '\0') {
@@ -423,10 +425,11 @@ sudo_ldap_conf_add_ports(void)
efree(ldap_conf.host); efree(ldap_conf.host);
ldap_conf.host = estrdup(hostbuf); ldap_conf.host = estrdup(hostbuf);
debug_return; debug_return_bool(true);
toobig: toobig:
fatalx(U_("sudo_ldap_conf_add_ports: out of space expanding hostbuf")); warningx(U_("sudo_ldap_conf_add_ports: out of space expanding hostbuf"));
debug_return_bool(false);
} }
#endif #endif
@@ -511,7 +514,8 @@ done:
debug_return_int(rc); debug_return_int(rc);
toobig: toobig:
fatalx(U_("sudo_ldap_parse_uri: out of space building hostbuf")); warningx(U_("sudo_ldap_parse_uri: out of space building hostbuf"));
debug_return_int(-1);
} }
#else #else
static char * static char *
@@ -1318,8 +1322,10 @@ sudo_ldap_build_pass1(struct passwd *pw)
sudo_gr_delref(grp); sudo_gr_delref(grp);
/* Add ALL to list and end the global OR */ /* Add ALL to list and end the global OR */
if (strlcat(buf, "(sudoUser=ALL)", sz) >= sz) if (strlcat(buf, "(sudoUser=ALL)", sz) >= sz) {
fatalx(U_("sudo_ldap_build_pass1 allocation mismatch")); warningx(U_("sudo_ldap_build_pass1 allocation mismatch"));
debug_return_str(NULL);
}
/* Add the time restriction, or simply end the global OR. */ /* Add the time restriction, or simply end the global OR. */
if (ldap_conf.timed) { if (ldap_conf.timed) {
@@ -1693,8 +1699,10 @@ sudo_ldap_read_config(void)
* Cannot specify port directly to ldap_create(), each host must * Cannot specify port directly to ldap_create(), each host must
* include :port to override the default. * include :port to override the default.
*/ */
if (ldap_conf.port != LDAP_PORT) if (ldap_conf.port != LDAP_PORT) {
sudo_ldap_conf_add_ports(); if (!sudo_ldap_conf_add_ports())
debug_return_bool(false);
}
#endif #endif
} }