From 4a691b06393a3d1fbde3fceb1db4d8273f419620 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 26 May 2004 17:27:20 +0000 Subject: Update. 2004-05-26 Jakub Jelinek * include/string.h (mempcpy, stpcpy): Add libc_hidden_builtin_proto. * string/bits/string2.h (memset): Disable macro for GCC 3.0+. (__mempcpy): Use __builtin_mempcpy for GCC 3.4+. (strchr): For GCC 3.2+, only use __rawmemchr if second argument is constant '\0' and first argument is not constant. (__stpcpy): Use __builtin_stpcpy for GCC 3.4+. (strncpy): Remove #ifdef _USE_STRING_ARCH_mempcpy variant. For GCC 3.2+ use __builtin_strncpy. (strncat): For GCC 3.2+ use __builtin_strncat. (strcmp): For GCC 3.2+ use __builtin_strcmp if both arguments are constant. (strcspn, strspn, strpbrk): For GCC 3.2+, use builtin function if both arguments are constant. 2004-05-26 Ulrich Drepper * nss/nss_files/files-hosts.c: Fix condition for looking up IPv4 mapped addresses in gethostbyaddr. --- nss/nss_files/files-hosts.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'nss') diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index 0f02b4fac9..8d1a8ee588 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -1,5 +1,5 @@ /* Hosts file parser in nss_files module. - Copyright (C) 1996-2001, 2003 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2003, 2004 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 @@ -278,6 +278,11 @@ HOST_DB_LOOKUP (hostbyname2, ,, LOOKUP_NAME_CASE (h_name, h_aliases) }, const char *name, int af) +#undef EXTRA_ARGS_VALUE +/* We only need to consider IPv4 mapped addresses if the input to the + gethostbyaddr() function is an IPv6 address. */ +#define EXTRA_ARGS_VALUE \ + , af, (len == IN6ADDRSZ ? AI_V4MAPPED : 0) DB_LOOKUP (hostbyaddr, ,, { if (result->h_length == (int) len -- cgit v1.2.3