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;

2
lib/roken/getnameinfo.c
View File

@@ -56,7 +56,7 @@ doit (int af,
addrlen,
af);
if (he != NULL) {
strlcpy (host, he->h_name, hostlen);
strlcpy (host, hostent_find_fqdn(he), hostlen);
if (flags & NI_NOFQDN) {
char *dot = strchr (host, '.');
if (dot != NULL)

59
lib/roken/hostent_find_fqdn.c Normal file
View File

@@ -0,0 +1,59 @@
/*
* Copyright (c) 1999 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
RCSID("$Id$");
#endif
#include "roken.h"
/*
* Try to find a fqdn (with `.') in he if possible, else return h_name
*/
char *
hostent_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;
}