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

(guess_domain): re-write to use getaddrinfo

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7494 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-12-04 18:03:39 +00:00
parent 7fa11bb3f0
commit 2459e3441b
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
appl/ftp/ftp/ruserpass.c
View File

@@ -71,10 +71,10 @@ static struct toktab {
static char *
guess_domain (char *hostname, size_t sz)
{
struct hostent *he;
struct addrinfo *ai;
struct addrinfo hints;
int error;
char *dot;
char *a;
char **aliases;
if (gethostname (hostname, sz) < 0) {
strlcpy (hostname, "", sz);
@@ -84,23 +84,20 @@ guess_domain (char *hostname, size_t sz)
if (dot != NULL)
return dot + 1;
he = gethostbyname (hostname);
if (he == NULL)
memset (&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
error = getaddrinfo (hostname, NULL, &hints, &ai);
if (error)
return hostname;
dot = strchr (he->h_name, '.');
if (dot != NULL) {
strlcpy (hostname, he->h_name, sz);
strlcpy (hostname, ai->ai_canonname, sz);
freeaddrinfo (ai);
dot = strchr (hostname, '.');
if (dot != NULL)
return dot + 1;
}
for (aliases = he->h_aliases; (a = *aliases) != NULL; ++aliases) {
dot = strchr (a, '.');
if (dot != NULL) {
strlcpy (hostname, a, sz);
return dot + 1;
}
}
return hostname;
else
return hostname;
}
int