From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 54D8D384BC32 for ; Tue, 16 Feb 2021 02:36:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 54D8D384BC32 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-30-9BYV6rKiOWeiWCgqwOuwuw-1; Mon, 15 Feb 2021 21:36:23 -0500 X-MC-Unique: 9BYV6rKiOWeiWCgqwOuwuw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08A15107ACC7; Tue, 16 Feb 2021 02:36:22 +0000 (UTC) Received: from greed.delorie.com (ovpn-114-77.rdu2.redhat.com [10.10.114.77]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7FAE5D9CD; Tue, 16 Feb 2021 02:36:21 +0000 (UTC) Received: from greed.delorie.com.redhat.com (localhost [127.0.0.1]) by greed.delorie.com (8.14.7/8.14.7) with ESMTP id 11G2aK9s014077; Mon, 15 Feb 2021 21:36:20 -0500 From: DJ Delorie To: Andreas Schwab Cc: libc-alpha@sourceware.org Subject: Re: v5 [PATCH 6/6] nsswitch: use new internal API (callers) In-Reply-To: <87wnv9z6ab.fsf@igel.home> (message from Andreas Schwab on Mon, 15 Feb 2021 16:42:36 +0100) Date: Mon, 15 Feb 2021 21:36:20 -0500 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.7 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Tue, 16 Feb 2021 02:36:26 -0000 Andreas Schwab writes: > This makes nss_compat non-functional. Since you have a way to test it, and have not included a reproducer, could you please test this patch? Thanks! >From 85b77876abf0d98eb57bf692499fd1f229459f72 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 15 Feb 2021 21:34:23 -0500 Subject: nss: fix nss_database_lookup2's alternate handling [27416] diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 46f232d720..6d4aa3b019 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -76,24 +76,25 @@ __nss_database_lookup2 (const char *database, const char *alternate_name, for (database_id = 0; database_names[database_id]; database_id++) if (strcmp (database_names[database_id], database) == 0) - break; + /* If *NI is NULL, the database was not mentioned in nsswitch.conf. + If *NI is not NULL, but *NI->module is NULL, the database was in + nsswitch.conf but listed no actions. We test for the former. */ + if (__nss_database_get (database_id, ni) && *ni != NULL) + return 0; - if (database_names[database_id] == NULL) - return -1; + /* Primary name not found, try alternate. */ + for (database_id = 0; database_names[database_id]; database_id++) + if (strcmp (database_names[database_id], alternate_name) == 0) + if (__nss_database_get (database_id, ni) && *ni != NULL) + return 0; - /* If *NI is NULL, the database was not mentioned in nsswitch.conf. - If *NI is not NULL, but *NI->module is NULL, the database was in - nsswitch.conf but listed no actions. We test for the former. */ - if (__nss_database_get (database_id, ni) && *ni != NULL) - { - /* Success. */ - return 0; - } - else - { - /* Failure. */ - return -1; - } + /* Neither found, use default config. */ + *ni = __nss_action_parse (defconfig); + if (*ni != NULL) + return 0; + + /* Failure. */ + return -1; } libc_hidden_def (__nss_database_lookup2)