From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 5A89A385AC1D; Thu, 13 Oct 2022 13:44:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A89A385AC1D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665668681; bh=7nOrpABN3JdvLHTFOpl/3lFoE06GzY9ho+uiVp4RQqU=; h=From:To:Subject:Date:From; b=BAy1Ea1KckkxQw6b4cZjbfejVHKTFh4Y888u1/aCHOx5jFKANOTBSplRS2ox1Vyiz tsiYQRI4/eSwO2ETfgQa7CgN9jS0oAXj/F/V3bt8FVUF2zhIXOXIuPLb3Y+q9qp+em Vxjzf6dW+kWMIQLxx1I+b5OtwIWBtcO942Sbqk+I= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] nss: Fix tst-nss-files-hosts-long on single-stack hosts (bug 24816) X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: 767c99850b2eaa236ef18f5e60bfcaccdede6611 X-Git-Newrev: 135c29bf9cda370a909bc3d17711c85564ba3913 Message-Id: <20221013134441.5A89A385AC1D@sourceware.org> Date: Thu, 13 Oct 2022 13:44:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=135c29bf9cda370a909bc3d17711c85564ba3913 commit 135c29bf9cda370a909bc3d17711c85564ba3913 Author: Florian Weimer Date: Tue Sep 13 16:11:40 2022 +0200 nss: Fix tst-nss-files-hosts-long on single-stack hosts (bug 24816) getent implicitly passes AI_ADDRCONFIG to getaddrinfo by default. Use --no-addrconfig to suppress that, so that both IPv4 and IPv6 lookups succeed even if the address family is not supported by the host. Reviewed-by: Carlos O'Donell (cherry picked from commit c75d20b5b27b0a60f0678236f51a4d3b0b058c00) Diff: --- NEWS | 1 + nss/tst-nss-files-hosts-long.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index a14a70eda3..41f6078084 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,7 @@ Major new features: The following bugs are resolved with this release: [12154] Do not fail DNS resolution for CNAMEs which are not host names + [24816] Fix tst-nss-files-hosts-long on single-stack hosts [25812] Libio vtable protection is sometimes only partially enforced [28838] FAIL: elf/tst-p_align3 [28846] CMSG_NXTHDR may trigger -Wstrict-overflow warning diff --git a/nss/tst-nss-files-hosts-long.c b/nss/tst-nss-files-hosts-long.c index 3942cf5fca..a7697e3143 100644 --- a/nss/tst-nss-files-hosts-long.c +++ b/nss/tst-nss-files-hosts-long.c @@ -28,14 +28,15 @@ do_test (void) { int ret; - /* Run getent to fetch the IPv4 address for host test4. - This forces /etc/hosts to be parsed. */ - ret = system("getent ahostsv4 test4"); + /* Run getent to fetch the IPv4 address for host test4. This forces + /etc/hosts to be parsed. Use --no-addrconfig to return addresses + even in an IPv6-only environment. */ + ret = system("getent --no-addrconfig ahostsv4 test4"); if (ret != 0) FAIL_EXIT1("ahostsv4 failed"); /* Likewise for IPv6. */ - ret = system("getent ahostsv6 test6"); + ret = system("getent --no-addrconfig ahostsv6 test6"); if (ret != 0) FAIL_EXIT1("ahostsv6 failed");