From afd71f4f5c995d68a00f0d34210d80eaf08dbed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 29 Aug 2017 22:58:50 +0200 Subject: [PATCH 02/14] Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): Only use gethostbyname4_r" This reverts commit 8479f23aa1d5e5477a37f46823856bdafaedfa46. See for the background https://sourceware.org/bugzilla/show_bug.cgi?id=16826 https://bugs.gentoo.org/show_bug.cgi?id=600632 This makes tst-nss-files-hosts-multi fail. Disable it. --- nss/Makefile | 1 - sysdeps/posix/getaddrinfo.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nss/Makefile b/nss/Makefile index d8b06b44fb..e3639f78ec 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -85,7 +85,6 @@ tests-container := \ # Tests which need libdl ifeq (yes,$(build-shared)) tests += tst-nss-files-hosts-erange -tests += tst-nss-files-hosts-multi tests += tst-nss-files-hosts-getent tests += tst-nss-files-alias-leak tests += tst-nss-files-alias-truncated diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index bcff909b2f..09954dee22 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -623,12 +623,8 @@ get_nss_addresses (const char *name, const struct addrinfo *req, } no_data = 0; - nss_gethostbyname4_r *fct4 = NULL; - - /* gethostbyname4_r sends out parallel A and AAAA queries and - is thus only suitable for PF_UNSPEC. */ - if (req->ai_family == PF_UNSPEC) - fct4 = __nss_lookup_function (nip, "gethostbyname4_r"); + nss_gethostbyname4_r *fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); if (fct4 != NULL) { -- 2.35.1