diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/getent.c | 4 | ||||
| -rw-r--r-- | nss/nss_files/files-hosts.c | 42 |
2 files changed, 28 insertions, 18 deletions
diff --git a/nss/getent.c b/nss/getent.c index 14ec3c4755..8b9a9030ff 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998-2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (c) 1998-2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. @@ -84,7 +84,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2006"); +"), "2007"); fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk"); } diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index b1ba3aa76d..6daafdeeed 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -1,6 +1,5 @@ /* Hosts file parser in nss_files module. - Copyright (C) 1996-2001, 2003, 2004, 2007 - Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2003, 2004, 2006 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 @@ -56,14 +55,30 @@ LINE_PARSER STRING_FIELD (addr, isspace, 1); /* Parse address. */ - 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; + 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; + } /* We always return entries of the requested form. */ result->h_addrtype = af; @@ -87,10 +102,6 @@ _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. */ \ @@ -111,8 +122,7 @@ _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] \ - __attribute__ ((__aligned__ (__alignof__ (struct hostent_data))));\ + char tmp_buffer[tmp_buflen]; \ struct hostent tmp_result_buf; \ int naddrs = 1; \ int naliases = 0; \ |