From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by sourceware.org (Postfix) with ESMTPS id 9F8923877021 for ; Tue, 9 Mar 2021 10:10:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9F8923877021 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=whitebox@nefkom.net Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DvrYV0x5wz1s1JB; Tue, 9 Mar 2021 11:10:06 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DvrYV0jjpz1r1MR; Tue, 9 Mar 2021 11:10:06 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id XtBVHnizDWgZ; Tue, 9 Mar 2021 11:10:05 +0100 (CET) X-Auth-Info: DyCyDxYhJt9Y0x34EZgOq2owlrE/s+9zsQbeQRP6/MwbzPzcL/KtnPKTynggpfs0 Received: from igel.home (ppp-46-244-162-79.dynamic.mnet-online.de [46.244.162.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 9 Mar 2021 11:10:05 +0100 (CET) Received: by igel.home (Postfix, from userid 1000) id A996C2C374E; Tue, 9 Mar 2021 11:10:04 +0100 (CET) From: Andreas Schwab To: DJ Delorie Cc: libc-alpha@sourceware.org Subject: Re: [PATCH v5] nss: fix nss_database_lookup2's alternate handling [BZ #27416] References: X-Yow: Darling, my ELBOW is FLYING over FRANKFURT, Germany.. Date: Tue, 09 Mar 2021 11:10:04 +0100 In-Reply-To: (DJ Delorie's message of "Mon, 08 Mar 2021 17:35:13 -0500") Message-ID: <87wnugab9f.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, 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, 09 Mar 2021 10:10:09 -0000 On Mär 08 2021, DJ Delorie wrote: > diff --git a/nscd/aicache.c b/nscd/aicache.c > index 1b4245ea53..38ef804fb1 100644 > --- a/nscd/aicache.c > +++ b/nscd/aicache.c > @@ -77,9 +77,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, > int rc4 = 0; > int herrno = 0; > > - no_more = __nss_database_lookup2 ("hosts", NULL, > - "dns [!UNAVAIL=return] files", > - &nip); > + no_more = (__nss_database_get (nss_database_hosts, &nip) == false); !x instead of x == false. > diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c > index f7e326811f..1c562d7dd3 100644 > --- a/nscd/initgrcache.c > +++ b/nscd/initgrcache.c > @@ -82,8 +82,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, > int no_more; > > if (group_database == NULL) > - no_more = __nss_database_lookup2 ("group", NULL, "files", > - &group_database); > + no_more = (__nss_database_get (nss_database_group, &group_database) == false); Likewise. > diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c > index 92d2a1c284..5357b5a873 100644 > --- a/sysdeps/posix/getaddrinfo.c > +++ b/sysdeps/posix/getaddrinfo.c > @@ -720,9 +720,7 @@ gaih_inet (const char *name, const struct gaih_service *service, > } > #endif > > - no_more = __nss_database_lookup2 ("hosts", NULL, > - "dns [!UNAVAIL=return] files", > - &nip); > + no_more = (__nss_database_get (nss_database_hosts, &nip) == false); Likewise. Ok with that changes. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."