From patchwork Fri Sep 23 11:13:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 57959 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D5CE2385734D for ; Fri, 23 Sep 2022 11:13:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D5CE2385734D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663931613; bh=8a3U+yuLnQqgyveiLrzzjPe/2t2DzRFh4Wwk1erGLak=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=u34Qi7rThKaMh83QfwWymw+CboNRqCmDPxCG9sHMK/JM9kYNrrsck/lkf8VDJ+AOT MwkC+L8pAhYNc7pwn61U42fTbqIrc7OI+kRsAKmzdfyJriCMhT9TGplD2Y3AKE6aMe Ig45hTPnokY2/Z+l1OL6XDyknntNKPDN2Vi3erUg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id B4E523858C52 for ; Fri, 23 Sep 2022 11:13:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B4E523858C52 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-583-GH2XW_UBM5iiLqtrs0O0Sw-1; Fri, 23 Sep 2022 07:13:08 -0400 X-MC-Unique: GH2XW_UBM5iiLqtrs0O0Sw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9FDE23C0F686 for ; Fri, 23 Sep 2022 11:13:08 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C46444B3FC6 for ; Fri, 23 Sep 2022 11:13:07 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 1/2] nss: Enhance tst-reload1 coverage and logging X-From-Line: 0e287934ef500ec39ac8610dde04f2ea4a9d4010 Mon Sep 17 00:00:00 2001 Message-Id: <0e287934ef500ec39ac8610dde04f2ea4a9d4010.1663931559.git.fweimer@redhat.com> Date: Fri, 23 Sep 2022 13:13:06 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- nss/tst-reload1.c | 51 +++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 22 deletions(-) base-commit: 774d43f27dbc730ee4b8b37bce4d5b3d5c0b74b6 Reviewed-by: Siddhesh Poyarekar diff --git a/nss/tst-reload1.c b/nss/tst-reload1.c index fdc5bdd65b..9cc6115c96 100644 --- a/nss/tst-reload1.c +++ b/nss/tst-reload1.c @@ -121,7 +121,7 @@ must_be_tests (struct passwd *pt, struct hostent *ht) TEST_VERIFY (p != NULL); if (p != NULL) { - TEST_VERIFY (strcmp (p->pw_name, pt[i].pw_name) == 0); + TEST_COMPARE_STRING (p->pw_name, pt[i].pw_name); } } @@ -132,8 +132,8 @@ must_be_tests (struct passwd *pt, struct hostent *ht) TEST_VERIFY (p != NULL); if (p != NULL) { - TEST_VERIFY (strcmp (p->pw_name, pt[i].pw_name) == 0); - TEST_VERIFY (p->pw_uid == pt[i].pw_uid); + TEST_COMPARE_STRING (p->pw_name, pt[i].pw_name); + TEST_COMPARE (p->pw_uid, pt[i].pw_uid); } } endpwent (); @@ -144,10 +144,12 @@ must_be_tests (struct passwd *pt, struct hostent *ht) TEST_VERIFY (h != NULL); if (h != NULL) { - TEST_VERIFY (strcmp (h->h_name, ht[i].h_name) == 0); + TEST_COMPARE_STRING (h->h_name, ht[i].h_name); + TEST_COMPARE (h->h_addrtype, AF_INET); TEST_VERIFY (h->h_addr_list[0] != NULL); - if (h->h_addr_list[0]) - TEST_VERIFY (strcmp (h->h_addr_list[0], ht[i].h_addr_list[0]) == 0); + if (h->h_addr_list[0] != NULL) + TEST_COMPARE_BLOB (h->h_addr_list[0], h->h_length, + ht[i].h_addr_list[0], ht[i].h_length); } } @@ -158,14 +160,16 @@ must_be_tests (struct passwd *pt, struct hostent *ht) int herrno, res; res = gethostbyname2_r (ht[i].h_name, AF_INET, - &r, buf, TESTBUFLEN, &rp, &herrno); - TEST_VERIFY (res == 0); + &r, buf, TESTBUFLEN, &rp, &herrno); + TEST_COMPARE (res, 0); if (res == 0) { - TEST_VERIFY (strcmp (r.h_name, ht[i].h_name) == 0); + TEST_COMPARE_STRING (r.h_name, ht[i].h_name); + TEST_COMPARE (r.h_addrtype, AF_INET); TEST_VERIFY (r.h_addr_list[0] != NULL); - if (r.h_addr_list[0]) - TEST_VERIFY (strcmp (r.h_addr_list[0], ht[i].h_addr_list[0]) == 0); + if (r.h_addr_list[0] != NULL) + TEST_COMPARE_BLOB (r.h_addr_list[0], r.h_length, + ht[i].h_addr_list[0], ht[i].h_length); } } @@ -175,10 +179,11 @@ must_be_tests (struct passwd *pt, struct hostent *ht) TEST_VERIFY (h != NULL); if (h != NULL) { - TEST_VERIFY (strcmp (h->h_name, ht[i].h_name) == 0); + TEST_COMPARE_STRING (h->h_name, ht[i].h_name); TEST_VERIFY (h->h_addr_list[0] != NULL); - if (h->h_addr_list[0]) - TEST_VERIFY (strcmp (h->h_addr_list[0], ht[i].h_addr_list[0]) == 0); + if (h->h_addr_list[0] != NULL) + TEST_COMPARE_BLOB (h->h_addr_list[0], h->h_length, + ht[i].h_addr_list[0], ht[i].h_length); } } @@ -198,17 +203,19 @@ must_be_tests (struct passwd *pt, struct hostent *ht) ap = NULL; res = getaddrinfo (ht[i].h_name, NULL, &hint, &ap); - TEST_VERIFY (res == 0); + TEST_COMPARE (res, 0); TEST_VERIFY (ap != NULL); if (res == 0 && ap != NULL) { j = 0; /* which address in the list */ while (ap) { + TEST_COMPARE (ap->ai_family, AF_INET); + struct sockaddr_in *in = (struct sockaddr_in *)ap->ai_addr; unsigned char *up = (unsigned char *)&in->sin_addr; - TEST_VERIFY (memcmp (up, ht[i].h_addr_list[j], 4) == 0); + TEST_COMPARE_BLOB (up, 4, ht[i].h_addr_list[j], 4); ap = ap->ai_next; ++j; @@ -233,7 +240,7 @@ must_be_tests (struct passwd *pt, struct hostent *ht) host_buf, sizeof(host_buf), NULL, 0, NI_NOFQDN); - TEST_VERIFY (res == 0); + TEST_COMPARE (res, 0); if (res == 0) TEST_VERIFY (strcmp (ht[i].h_name, host_buf) == 0); else @@ -285,8 +292,8 @@ test_cross_switch_consistency (void) TEST_VERIFY (p != NULL); if (p != NULL) { - TEST_VERIFY (strcmp (p->pw_name, pwd_table_1[i].pw_name) == 0); - TEST_VERIFY (p->pw_uid == pwd_table_1[i].pw_uid); + TEST_COMPARE_STRING (p->pw_name, pwd_table_1[i].pw_name); + TEST_COMPARE (p->pw_uid, pwd_table_1[i].pw_uid); } /* After the first lookup, switch to conf2 and verify */ @@ -296,7 +303,7 @@ test_cross_switch_consistency (void) xrename ("/etc/nsswitch.conf2", "/etc/nsswitch.conf"); p = getpwnam (pwd_table_2[0].pw_name); - TEST_VERIFY (p->pw_uid == pwd_table_2[0].pw_uid); + TEST_COMPARE (p->pw_uid, pwd_table_2[0].pw_uid); } /* But the original loop should still be on conf1. */ @@ -311,8 +318,8 @@ test_cross_switch_consistency (void) TEST_VERIFY (p != NULL); if (p != NULL) { - TEST_VERIFY (strcmp (p->pw_name, pwd_table_2[i].pw_name) == 0); - TEST_VERIFY (p->pw_uid == pwd_table_2[i].pw_uid); + TEST_COMPARE_STRING (p->pw_name, pwd_table_2[i].pw_name); + TEST_COMPARE (p->pw_uid, pwd_table_2[i].pw_uid); } } endpwent (); From patchwork Fri Sep 23 11:13:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 57960 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D129A385702D for ; Fri, 23 Sep 2022 11:13:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D129A385702D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663931624; bh=iV2UY4ZkgDU6aglrK/HGFGHsUS0P48O4vJ16P33FfFs=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=V6oA7e5mC3OkjHh6x7Fgq8/1do+qDjkHlmKv3LtFJBh2reA7J/3xD7LFF0BQlcjmu Q/Qlm32RUu6vcMrJVcUuwZ8aoQWJ68mVESUhelAXpV8YiU5/15I9HTuGHbKPYzOeZ7 393coqt9ZQQRDqZg/WffPiZ+w/hdLTK1ONziQEx4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5CFEE385742D for ; Fri, 23 Sep 2022 11:13:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5CFEE385742D Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-448-4tvND8foPS6YuWRKTNylfQ-1; Fri, 23 Sep 2022 07:13:20 -0400 X-MC-Unique: 4tvND8foPS6YuWRKTNylfQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C7DC85A583 for ; Fri, 23 Sep 2022 11:13:20 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 092AD140EBF3 for ; Fri, 23 Sep 2022 11:13:19 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 2/2] nss: Use shared prefix in IPv4 address in tst-reload1 In-Reply-To: <0e287934ef500ec39ac8610dde04f2ea4a9d4010.1663931559.git.fweimer@redhat.com> References: <0e287934ef500ec39ac8610dde04f2ea4a9d4010.1663931559.git.fweimer@redhat.com> X-From-Line: dd8d1a60722612e363ebcfe69d2b1affedda41cf Mon Sep 17 00:00:00 2001 Message-Id: Date: Fri, 23 Sep 2022 13:13:18 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 --- 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 9cc6115c96..c9db197d55 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[] = {