aboutsummaryrefslogtreecommitdiff
path: root/nss/nss_files
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-07-31 13:33:18 +0000
committerJakub Jelinek <jakub@redhat.com>2007-07-31 13:33:18 +0000
commit32c075e1f01849e161724bbd400ba77244e482cc (patch)
tree5f083a3f352104f32bb6c902d57fa3f294bd8d4d /nss/nss_files
parentd6220e9ee38c1c9285221b023346201ec5f511b3 (diff)
downloadglibc-32c075e1f01849e161724bbd400ba77244e482cc.tar
glibc-32c075e1f01849e161724bbd400ba77244e482cc.tar.gz
glibc-32c075e1f01849e161724bbd400ba77244e482cc.tar.bz2
glibc-32c075e1f01849e161724bbd400ba77244e482cc.zip
.
Diffstat (limited to 'nss/nss_files')
-rw-r--r--nss/nss_files/files-hosts.c42
1 files changed, 16 insertions, 26 deletions
diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c
index 6daafdeeed..b1ba3aa76d 100644
--- a/nss/nss_files/files-hosts.c
+++ b/nss/nss_files/files-hosts.c
@@ -1,5 +1,6 @@
/* Hosts file parser in nss_files module.
- Copyright (C) 1996-2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1996-2001, 2003, 2004, 2007
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -55,30 +56,14 @@ LINE_PARSER
STRING_FIELD (addr, isspace, 1);
/* Parse address. */
- if (inet_pton (af, addr, entdata->host_addr) <= 0)
- {
- if (af == AF_INET6 && (flags & AI_V4MAPPED) != 0
- && inet_pton (AF_INET, addr, entdata->host_addr) > 0)
- 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 if (IN6_IS_ADDR_LOOPBACK (entdata->host_addr))
- {
- in_addr_t localhost = htonl (INADDR_LOOPBACK);
- memcpy (entdata->host_addr, &localhost, sizeof (localhost));
- }
- else
- /* Illegal address: ignore line. */
- return 0;
- }
- else
- /* Illegal address: ignore line. */
- return 0;
- }
+ if (inet_pton (af, addr, entdata->host_addr) <= 0
+ && (af != AF_INET6 || (flags & AI_V4MAPPED) == 0
+ || inet_pton (AF_INET, addr, entdata->host_addr) <= 0
+ || (map_v4v6_address ((char *) entdata->host_addr,
+ (char *) entdata->host_addr),
+ 0)))
+ /* Illegal address: ignore line. */
+ return 0;
/* We always return entries of the requested form. */
result->h_addrtype = af;
@@ -102,6 +87,10 @@ _nss_files_get##name##_r (proto, \
{ \
enum nss_status status; \
\
+ uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct hostent_data); \
+ buffer += pad; \
+ buflen = buflen > pad ? buflen - pad : 0; \
+ \
__libc_lock_lock (lock); \
\
/* Reset file pointer to beginning or open file. */ \
@@ -122,7 +111,8 @@ _nss_files_get##name##_r (proto, \
{ \
/* We have to get all host entries from the file. */ \
const size_t tmp_buflen = MIN (buflen, 4096); \
- char tmp_buffer[tmp_buflen]; \
+ char tmp_buffer[tmp_buflen] \
+ __attribute__ ((__aligned__ (__alignof__ (struct hostent_data))));\
struct hostent tmp_result_buf; \
int naddrs = 1; \
int naliases = 0; \