From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 96DA1385800B; Fri, 14 Oct 2022 11:03:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 96DA1385800B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665745387; bh=/23wik0aVlh2n2TdHJcfOYacQy+/HKUshUECYsmoZao=; h=From:To:Subject:Date:From; b=LYDT5hAUsQgOIXR6NoR2wjCc46DuFvuD2XGsqrJ9olzcJ34vQnxSQnG3cPkNvN+3C G+AfWwbr3r8AcopERHCVkG5spp4U+TzflmcBM4iZMgVaCn+NeSBP8yfy3Ps8i2RgqV bX6bCdzBuIgX/QkQzqKt3YxeM04MsZ7Vrd7xCif4= 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.34/master] nss: Use shared prefix in IPv4 address in tst-reload1 X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 16c7ed6e68c13e5a5efd8ab464ebf9d07b4b0bb3 X-Git-Newrev: d5313bcb7e56cd949ca920bb0c741a1d1d4093cf Message-Id: <20221014110307.96DA1385800B@sourceware.org> Date: Fri, 14 Oct 2022 11:03:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d5313bcb7e56cd949ca920bb0c741a1d1d4093cf commit d5313bcb7e56cd949ca920bb0c741a1d1d4093cf 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 27a18ed9c3..844cfcddc5 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[] = {