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

Fix warning about unresolved host name with "sudo -l -h hostname".

Browse Source 
The resolve_host() function returns 0 on success, not bool.
This commit is contained in:
Todd C. Miller
2020-01-28 13:00:54 -07:00
parent 4e87e1a97b
commit 604945f93e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/sudoers/sudoers.c
View File

@@ -1146,6 +1146,7 @@ static bool
cb_fqdn(const union sudo_defs_val *sd_un) cb_fqdn(const union sudo_defs_val *sd_un)
{ {
bool remote; bool remote;
int rc;
char *lhost, *shost; char *lhost, *shost;
debug_decl(cb_fqdn, SUDOERS_DEBUG_PLUGIN); debug_decl(cb_fqdn, SUDOERS_DEBUG_PLUGIN);
@@ -1158,8 +1159,7 @@ cb_fqdn(const union sudo_defs_val *sd_un)
/* First resolve user_host, setting user_host and user_shost. */ /* First resolve user_host, setting user_host and user_shost. */
if (resolve_host(user_host, &lhost, &shost) != 0) { if (resolve_host(user_host, &lhost, &shost) != 0) {
int rc = resolve_host(user_runhost, &lhost, &shost); if ((rc = resolve_host(user_runhost, &lhost, &shost)) != 0) {
if (rc != 0) {
gai_log_warning(SLOG_SEND_MAIL|SLOG_RAW_MSG, rc, gai_log_warning(SLOG_SEND_MAIL|SLOG_RAW_MSG, rc,
N_("unable to resolve host %s"), user_host); N_("unable to resolve host %s"), user_host);
debug_return_bool(false); debug_return_bool(false);
@@ -1174,8 +1174,10 @@ cb_fqdn(const union sudo_defs_val *sd_un)
/* Next resolve user_runhost, setting user_runhost and user_srunhost. */ /* Next resolve user_runhost, setting user_runhost and user_srunhost. */
lhost = shost = NULL; lhost = shost = NULL;
if (remote) { if (remote) {
if (!resolve_host(user_runhost, &lhost, &shost)) { if ((rc = resolve_host(user_runhost, &lhost, &shost)) != 0) {
sudo_warnx(U_("unable to resolve host %s"), user_runhost); gai_log_warning(SLOG_NO_LOG|SLOG_RAW_MSG, rc,
N_("unable to resolve host %s"), user_runhost);
debug_return_bool(false);
} }
} else { } else {
/* Not remote, just use user_host. */ /* Not remote, just use user_host. */