330b961e66
Upstream commit: 4ed990e5b97a61f29f929bdeb36c5b2abb547a64 - Add MADV_POPULATE_READ and MADV_POPULATE_WRITE from Linux 5.14 to bits/mman-linux.h - Update kernel version to 5.14 in tst-mman-consts.py - Update syscall lists for Linux 5.14 - Use Linux 5.14 in build-many-glibcs.py - Fix failing nss/tst-nss-files-hosts-long with local resolver - iconvconfig: Fix behaviour with --prefix [BZ #28199] - nptl: Fix race between pthread_kill and thread exit (swbz#12889, #1994068) - nptl: pthread_kill, pthread_cancel should not fail after exit (swbz#19193, #1994068) - support: Add support_wait_for_thread_exit - MIPS: Setup errno for {f,l,}xstat - x86-64: Use testl to check __x86_string_control - elf: Fix missing colon in LD_SHOW_AUXV output (swbz#28253, #1995648) - librt: add test (swbz#28213, #1994264) - CVE-2021-38604: fix NULL pointer dereference in mq_notify (swbz#28213, #1994264) - Linux: Fix fcntl, ioctl, prctl redirects for _TIME_BITS=64 (bug 28182) - iconv_charmap: Close output file when done - copy_and_spawn_sgid: Avoid double calls to close() - gaiconf_init: Avoid double-free in label and precedence lists - gconv_parseconfdir: Fix memory leak - ldconfig: avoid leak on empty paths in config file
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
commit ae925404a10bf0ea63d6e8d41e3821f68b4d776c
|
|
Author: Aurelien Jarno <aurelien@aurel32.net>
|
|
Date: Fri Sep 3 00:28:14 2021 +0200
|
|
|
|
Fix failing nss/tst-nss-files-hosts-long with local resolver
|
|
|
|
When a local resolver like unbound is listening on the IPv4 loopback
|
|
address 127.0.0.1, the nss/tst-nss-files-hosts-long test fails. This is
|
|
due to:
|
|
- the default resolver in the absence of resolv.conf being 127.0.0.1
|
|
- the default DNS NSS database configuration in the absence of
|
|
nsswitch.conf being 'hosts: dns [!UNAVAIL=return] file'
|
|
|
|
This causes the requests for 'test4' and 'test6' to first be sent to the
|
|
local resolver, which responds with NXDOMAIN in the likely case those
|
|
records do no exist. In turn that causes the access to /etc/hosts to be
|
|
skipped, which is the purpose of that test.
|
|
|
|
Fix that by providing a simple nsswitch.conf file forcing access to
|
|
/etc/hosts for that test. I have tested that the only changed result in
|
|
the testsuite is that test.
|
|
|
|
(cherry picked from commit 2738480a4b0866723fb8c633f36bdd34a8767581)
|
|
|
|
diff --git a/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf b/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf
|
|
new file mode 100644
|
|
index 0000000000000000..5b0c6a419937a013
|
|
--- /dev/null
|
|
+++ b/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf
|
|
@@ -0,0 +1 @@
|
|
+hosts: files
|