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

Use AI_FQDN instead of AI_CANONNAME if available since "canonical"

Browse Source 
is not always the same as "fully qualified".
This commit is contained in:
Todd C. Miller
2012-08-15 09:52:26 -04:00
parent e01886ed2f
commit 6260a75891
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/sudoers/sudoers.c
View File

@@ -1072,8 +1072,13 @@ set_loginclass(struct passwd *pw)
} }
#endif /* HAVE_LOGIN_CAP_H */ #endif /* HAVE_LOGIN_CAP_H */
#ifndef AI_FQDN
# define AI_FQDN AI_CANONNAME
#endif
/* /*
* Look up the fully qualified domain name and set user_host and user_shost. * Look up the fully qualified domain name and set user_host and user_shost.
* Use AI_FQDN if available since "canonical" is not always the same as fqdn.
*/ */
void void
set_fqdn(void) set_fqdn(void)
@@ -1084,7 +1089,7 @@ set_fqdn(void)
zero_bytes(&hint, sizeof(hint)); zero_bytes(&hint, sizeof(hint));
hint.ai_family = PF_UNSPEC; hint.ai_family = PF_UNSPEC;
hint.ai_flags = AI_CANONNAME; hint.ai_flags = AI_FQDN;
if (getaddrinfo(user_host, NULL, &hint, &res0) != 0) { if (getaddrinfo(user_host, NULL, &hint, &res0) != 0) {
log_error(MSG_ONLY, _("unable to resolve host %s"), user_host); log_error(MSG_ONLY, _("unable to resolve host %s"), user_host);
} else { } else {
@@ -1093,11 +1098,11 @@ set_fqdn(void)
efree(user_host); efree(user_host);
user_host = estrdup(res0->ai_canonname); user_host = estrdup(res0->ai_canonname);
freeaddrinfo(res0); freeaddrinfo(res0);
if ((p = strchr(user_host, '.')) != NULL)
user_shost = estrndup(user_host, (size_t)(p - user_host));
else
user_shost = user_host;
} }
if ((p = strchr(user_host, '.')) != NULL)
user_shost = estrndup(user_host, (size_t)(p - user_host));
else
user_shost = user_host;
debug_return; debug_return;
} }