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

separate find_fqdn

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10303 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-07-09 15:14:19 +00:00
parent adfd040a69
commit 130be40de4
3 changed files with 63 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/roken/getaddrinfo.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999 - 2000 Kungliga Tekniska H<>gskolan
* Copyright (c) 1999 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -215,26 +215,6 @@ get_null (const struct addrinfo *hints,
return 0;
}
/*
* Try to find a fqdn (with `.') in he if possible, else return h_name
*/
static char *
find_fqdn (const struct hostent *he)
{
char *ret = he->h_name;
char **h;
if (strchr (ret, '.') == NULL)
for (h = he->h_aliases; *h; ++h) {
if (strchr (*h, '.') != NULL) {
ret = *h;
break;
}
}
return ret;
}
static int
add_hostent (int port, int protocol, int socktype,
struct addrinfo ***current,
@@ -248,14 +228,14 @@ add_hostent (int port, int protocol, int socktype,
if (*flags & AI_CANONNAME) {
struct hostent *he2 = NULL;
canonname = find_fqdn (he);
canonname = hostent_find_fqdn (he);
if (strchr (canonname, '.') == NULL) {
int error;
he2 = getipnodebyaddr (he->h_addr_list[0], he->h_length,
he->h_addrtype, &error);
if (he2 != NULL) {
char *tmp = find_fqdn (he2);
char *tmp = hostent_find_fqdn (he2);
if (strchr (tmp, '.') != NULL)
canonname = tmp;