1708d98eba
* Mon Nov 14 2022 Arjun Shankar <arjun@redhat.com> - 2.34-49 - Sync with upstream branch release/2.34/master, commit: 75b0edb7ef338084e53925139ae81fb0dfc07dd4: - Update NEWS file in the right place - Linux: Support __IPC_64 in sysvctl *ctl command arguments (bug 29771) - io: Fix use-after-free in ftw [BZ #26779] - io: Fix ftw internal realloc buffer (BZ #28126) - regex: fix buffer read overrun in search [BZ#28470] - regex: copy back from Gnulib - Allow #pragma GCC in headers in conformtest - Fix memmove call in vfprintf-internal.c:group_number - mktime: improve heuristic for ca-1986 Indiana DST - Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 [BZ# 29564] - linux: Fix generic struct_stat for 64 bit time (BZ# 29657) - elf: Do not completely clear reused namespace in dlmopen (bug 29600) - nss: Use shared prefix in IPv4 address in tst-reload1 - nss: Fix tst-nss-files-hosts-long on single-stack hosts (bug 24816) - nss: Implement --no-addrconfig option for getent Resolves: #2141728 Resolves: #2110357 Resolves: #2141685
48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
commit d5313bcb7e56cd949ca920bb0c741a1d1d4093cf
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri Sep 23 19:30:57 2022 +0200
|
|
|
|
nss: Use shared prefix in IPv4 address in tst-reload1
|
|
|
|
Otherwise, sorting based on the longest-matching prefix in
|
|
getaddrinfo can reorder the addresses in ways the test does not
|
|
expect, depending on the IPv4 address of the host.
|
|
|
|
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
(cherry picked from commit c02e29a0ba47d636281e1a026444a1a0a254aa12)
|
|
|
|
diff --git a/nss/tst-reload1.c b/nss/tst-reload1.c
|
|
index 27a18ed9c37607bb..844cfcddc5e0f638 100644
|
|
--- a/nss/tst-reload1.c
|
|
+++ b/nss/tst-reload1.c
|
|
@@ -43,12 +43,12 @@ static struct passwd pwd_table_1[] = {
|
|
|
|
static const char *hostaddr_5[] =
|
|
{
|
|
- "ABCD", "abcd", "1234", NULL
|
|
+ "ABCd", "ABCD", "ABC4", NULL
|
|
};
|
|
|
|
static const char *hostaddr_15[] =
|
|
{
|
|
- "4321", "ghij", NULL
|
|
+ "4321", "4322", NULL
|
|
};
|
|
|
|
static const char *hostaddr_25[] =
|
|
@@ -86,12 +86,12 @@ static const char *hostaddr_6[] =
|
|
|
|
static const char *hostaddr_16[] =
|
|
{
|
|
- "7890", "a1b2", NULL
|
|
+ "7890", "7891", NULL
|
|
};
|
|
|
|
static const char *hostaddr_26[] =
|
|
{
|
|
- "qwer", "tyui", NULL
|
|
+ "qwer", "qweR", NULL
|
|
};
|
|
|
|
static struct hostent host_table_2[] = {
|