mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-07 13:28:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

drop address family conversions from /etc/hosts parser

Browse Source 
for ChangeLog

	* nss/nss_files/files-hosts.c (LINE_PARSER): Drop all address
	family conversions.
This commit is contained in:
Alexandre Oliva 2014-09-27 07:13:20 -03:00
parent 393207b6a7
commit 7875573cbe
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nss/nss_files/files-hosts.c
View File

@ -43,9 +43,6 @@ struct hostent_data
char *h_addr_ptrs[2]; /* Points to that and null terminator. */ char *h_addr_ptrs[2]; /* Points to that and null terminator. */
}; };
#define IN_IS_ADDR_LOOPBACK(addr) \
(((const char *)(addr))[0] == IN_LOOPBACKNET)
#define TRAILING_LIST_MEMBER h_aliases #define TRAILING_LIST_MEMBER h_aliases
#define TRAILING_LIST_SEPARATOR_P isspace #define TRAILING_LIST_SEPARATOR_P isspace
#include "files-parse.c" #include "files-parse.c"
@ -60,29 +57,12 @@ LINE_PARSER
if (inet_pton (af == AF_UNSPEC ? AF_INET : af, addr, entdata->host_addr) if (inet_pton (af == AF_UNSPEC ? AF_INET : af, addr, entdata->host_addr)
> 0) > 0)
af = af == AF_UNSPEC ? AF_INET : af; af = af == AF_UNSPEC ? AF_INET : af;
else if (af == AF_UNSPEC
&& inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
af = AF_INET6;
else else
{ /* Illegal address: ignore line. */
if (af == AF_INET6 && (flags & AI_V4MAPPED) != 0 return 0;
&& inet_pton (AF_INET, addr, entdata->host_addr) > 0
&& !IN_IS_ADDR_LOOPBACK (entdata->host_addr))
map_v4v6_address ((char *) entdata->host_addr,
(char *) entdata->host_addr);
else if (af == AF_INET
&& inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
{
if (IN6_IS_ADDR_V4MAPPED (entdata->host_addr))
memcpy (entdata->host_addr, entdata->host_addr + 12, INADDRSZ);
else
/* Illegal address: ignore line. */
return 0;
}
else if (af == AF_UNSPEC
&& inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
af = AF_INET6;
else
/* Illegal address: ignore line. */
return 0;
}
/* We always return entries of the requested form. */ /* We always return entries of the requested form. */
result->h_addrtype = af; result->h_addrtype = af;