oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_expand_hostname): use getaddrinfo

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7489 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-12-04 17:58:27 +00:00
parent 518c2f9f4f
commit 861698f953
1 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/krb5/expand_hostname.c
View File

@@ -40,45 +40,21 @@ krb5_expand_hostname (krb5_context context,
const char *orig_hostname, const char *orig_hostname,
char **new_hostname) char **new_hostname)
{ {
struct hostent *he = NULL; struct addrinfo *ai, hints;
int error; int error;
char *tmp;
#ifdef HAVE_IPV6 memset (&hints, 0, sizeof(hints));
{ hints.ai_flags = AI_CANONNAME;
struct in6_addr sin6;
if (he == NULL && inet_pton (AF_INET6, orig_hostname, &sin6) == 1) error = getaddrinfo (orig_hostname, NULL, &hints, &ai);
he = getipnodebyaddr (&sin6, sizeof(sin6), AF_INET6, &error); if (error) {
}
#endif
{
struct in_addr sin;
if (he == NULL && inet_pton (AF_INET, orig_hostname, &sin) == 1)
he = getipnodebyaddr (&sin, sizeof(sin), AF_INET, &error);
}
#ifdef HAVE_IPV6
if (he == NULL)
he = getipnodebyname (orig_hostname, AF_INET6, 0, &error);
#endif
if (he == NULL)
he = getipnodebyname (orig_hostname, AF_INET, 0, &error);
if (he == NULL) {
*new_hostname = strdup (orig_hostname); *new_hostname = strdup (orig_hostname);
if (*new_hostname == NULL) if (*new_hostname == NULL)
return ENOMEM; return ENOMEM;
return 0; return 0;
} }
tmp = he->h_name; *new_hostname = strdup(ai->ai_canonname);
if (strchr (tmp, '.') == NULL freeaddrinfo (ai);
&& he->h_aliases != NULL
&& he->h_aliases[0] != NULL
&& strchr (he->h_aliases[0], '.') != NULL)
tmp = he->h_aliases[0];
*new_hostname = strdup (tmp);
freehostent (he);
if (*new_hostname == NULL) if (*new_hostname == NULL)
return ENOMEM; return ENOMEM;
return 0; return 0;