From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id AA25F3861029; Wed, 26 Oct 2022 15:09:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AA25F3861029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666796966; bh=Zzbgr9Gz6o7igUy7ci8K3IAR+5DA8Zb8EHCey7Y8Szg=; h=From:To:Subject:Date:From; b=hX9vmrUUH/GEAWm6hu1VwCILQQt09UuO8PnLT/JJmVmNa+6rmzhUfwu0oIzKF91A4 UAyj/JBntGAUw5TJmNk28X0eg4oHmhKVqdNu+QdzpsaOG7p3DoJUFqQ1zSeeHwfY6z toJcnUSffqPETKDH/ujJMHhSO30JarPG3+uYAOz0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] nss: Use shared prefix in IPv4 address in tst-reload1 X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 2681d38cafaceafeb330bc0536fa710b75ed5947 X-Git-Newrev: 908454129d21126bf7fc58f2a520b1f304dc5f02 Message-Id: <20221026150926.AA25F3861029@sourceware.org> Date: Wed, 26 Oct 2022 15:09:26 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=908454129d21126bf7fc58f2a520b1f304dc5f02 commit 908454129d21126bf7fc58f2a520b1f304dc5f02 Author: Florian Weimer 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 (cherry picked from commit c02e29a0ba47d636281e1a026444a1a0a254aa12) Diff: --- nss/tst-reload1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nss/tst-reload1.c b/nss/tst-reload1.c index fdc5bdd65b..bc32bb132a 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[] = {