blob: 5604d9f648ada54f8803149687e0bf7aabcef061 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From cc789d18e5f6bb39ecca6ee8ec2872bd7a737160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Tue, 29 Aug 2017 22:58:50 +0200
Subject: [PATCH 2/5] 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 | 9 ++-------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/nss/Makefile b/nss/Makefile
index 97bab5bb75..7a6ddebde2 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -68,7 +68,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 ed04e564f9..ce9e0d342d 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -739,13 +739,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
while (!no_more)
{
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)
{
while (1)
--
2.26.2
|
GitWeb
