From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) by sourceware.org (Postfix) with ESMTPS id 1CEEE385840A for ; Fri, 20 Oct 2023 12:00:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1CEEE385840A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1CEEE385840A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c2c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697803225; cv=none; b=T9OIr1LCzsioZ9UJQ899pkku7xR3+qE66B5oc5lC2FdObyCaU47pzeuPARXUTfl1yH/WO2Na/WpKsW+66Yp0DoS893268llV0kBUn9FrfTpIr975ULEX590Vy/Zr7TIcThQkiZM2MZ3Q6+7GWR2hhFhxg6qJcC68fshpaSjgvoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697803225; c=relaxed/simple; bh=hZqHJGmMsRmtLOd+XP030dDY3JyJpz3b+Pv+3uD9JfM=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=cQl9EOblUuOSWydancNr9/aS/8TS3XTCNbS0Rihhk4PmLn9Y1spbF1y3dheW6AWKL3mGIEJ3RVXJ6Q/lmZDQbe/cAHS2s2xkusSrJgWapFh5RrlurSTBeu2A1y5HMdTbBlXjdYvoZ0JraPwlabqyQQVrw+8UE2k2rC3WYjI4jxA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc2c.google.com with SMTP id 006d021491bc7-584042a01eeso397280eaf.2 for ; Fri, 20 Oct 2023 05:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697803222; x=1698408022; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=kEEkvQCcwz3+5JMKme/Nwexfi/GayzhIUpUrk4tRYkg=; b=pKTTsNSBrlW6FhdcxNFweUfQOZdJ4Z+6IBMsPrgdu50zGbO9Ag0vCF4VZR/BVnSOVO q5Bchuy6cZ/lv5rvM9bSvVz60hDBaOPTRfjGGuq5W9m8uC0rBr5g5f6gZx8nahipOE8n VzVLt1dVHaEWgMLXIVSU2SiKG3DKItY6KatsGwupJwJLHIgbEgRqSb5MP7ieqo1Y/hKl 4dtQWVyiERYNVLS0ONJal6tJfjs9z3lDYburw/mybW74Yf4jBlEc4VB+ekBHpAdLnyh+ 1wA+AFlWQaXY9QFxPgxfw6AQdNILF6hpHsSOhlA5xZoYxS/p/JwND2tsW5M8Bi8K/xvi WPgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697803222; x=1698408022; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kEEkvQCcwz3+5JMKme/Nwexfi/GayzhIUpUrk4tRYkg=; b=uSnM4JsdPIG33AZUejcS5P44A8vod8475CYF1uQlyYiiIg43GEbWPtjzl5540xIJzL pIo6JHwQCNjq6CoMfY170NkFFq25qUldqfjE+LLXO4Gi9np+aKaCIuTOt3hUe+CbToPF Y/IcLJ1ol6T2pi5wu4/7LS6yaLi9g8sNUlXnBFDFOKDWgfzHq851Gsroy6urhAhfkeoj mNdTOJ97kv9Hluf8a3fzoU0hRmMPz6qi0rFpPQcFxuZ1g9e3QYVVu8FX4S95Lo9i+HAo ZI6It3dRvDksvBizQlL+UfMhLbGVFA1v2O/uFyBdmuKaRMuNituFvHGgcqtwfzXd1HGg bEvg== X-Gm-Message-State: AOJu0YxRgCARDXDNkWcFWeA+bRPNJfHFlt1YNslmIHEkZrNBDzxJ8+cF wKDLQfCEKdC0sjpogfKyIZZg7Q== X-Google-Smtp-Source: AGHT+IHZESjMQ+j3pfmRcThnR6fg4M65dwpRFF0HvzneM/+NDifwV0Mh/33yksHPo4RiAyc6QjQk9Q== X-Received: by 2002:a05:6358:e4a7:b0:166:a7ff:afbe with SMTP id by39-20020a056358e4a700b00166a7ffafbemr1637506rwb.0.1697803222222; Fri, 20 Oct 2023 05:00:22 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:a647:b489:1074:73d4:b147? ([2804:1b3:a7c3:a647:b489:1074:73d4:b147]) by smtp.gmail.com with ESMTPSA id x125-20020a626383000000b0069346777241sm1475117pfb.97.2023.10.20.05.00.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Oct 2023 05:00:21 -0700 (PDT) Message-ID: Date: Fri, 20 Oct 2023 09:00:18 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 10/16] Move 'netgroup' routines from 'inet' into 'nss' Content-Language: en-US To: Arjun Shankar , libc-alpha@sourceware.org References: <20231002130150.1497733-1-arjun@redhat.com> <20231002130150.1497733-11-arjun@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20231002130150.1497733-11-arjun@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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 List-Id: On 02/10/23 09:55, Arjun Shankar wrote: > These netgroup routines are entry points for nss functionality. > This commit moves them along with netgroup.h from the 'inet' > subdirectory to 'nss', and adjusts any references accordingly. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > include/netdb.h | 2 +- > include/netgroup.h | 2 +- > inet/Makefile | 4 ---- > inet/Versions | 12 ++++-------- > nscd/netgroupcache.c | 2 +- > nss/Makefile | 11 +++++++++++ > nss/Versions | 7 +++++++ > {inet => nss}/getnetgrent.c | 0 > {inet => nss}/getnetgrent_r.c | 0 > {inet => nss}/netgroup.h | 0 > 10 files changed, 25 insertions(+), 15 deletions(-) > rename {inet => nss}/getnetgrent.c (100%) > rename {inet => nss}/getnetgrent_r.c (100%) > rename {inet => nss}/netgroup.h (100%) > > diff --git a/include/netdb.h b/include/netdb.h > index 4dcdbb8cd4..1b25837b4b 100644 > --- a/include/netdb.h > +++ b/include/netdb.h > @@ -211,7 +211,7 @@ libanl_hidden_proto (__gai_suspend_time64) > > #define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) > > -#include > +#include > > extern enum nss_status _nss_netgroup_parseline (char **cursor, > struct __netgrent *result, > diff --git a/include/netgroup.h b/include/netgroup.h > index 4b2b284cdb..40a5d1a65e 100644 > --- a/include/netgroup.h > +++ b/include/netgroup.h > @@ -1 +1 @@ > -#include > +#include > diff --git a/inet/Makefile b/inet/Makefile > index d378542549..9f39f7ff2b 100644 > --- a/inet/Makefile > +++ b/inet/Makefile > @@ -54,8 +54,6 @@ routines := \ > getnetbynm_r \ > getnetent \ > getnetent_r \ > - getnetgrent \ > - getnetgrent_r \ > getproto \ > getproto_r \ > getprtent \ > @@ -160,8 +158,6 @@ CFLAGS-getprtent_r.c += -fexceptions > CFLAGS-getprtent.c += -fexceptions > CFLAGS-either_ntoh.c += -fexceptions > CFLAGS-either_hton.c += -fexceptions > -CFLAGS-getnetgrent.c += -fexceptions > -CFLAGS-getnetgrent_r.c += -fexceptions > CFLAGS-in6_addr.c += $(config-cflags-wno-ignored-attributes) > CFLAGS-if_index.c += $(config-cflags-wno-ignored-attributes) > CFLAGS-ifaddrs.c += $(config-cflags-wno-ignored-attributes) > diff --git a/inet/Versions b/inet/Versions > index d937e9835c..1ffa444730 100644 > --- a/inet/Versions > +++ b/inet/Versions > @@ -7,7 +7,7 @@ libc { > rexecoptions; > > # e* > - endaliasent; endhostent; endnetent; endnetgrent; endprotoent; endservent; > + endaliasent; endhostent; endnetent; endprotoent; endservent; > > # e* > ether_aton; ether_aton_r; ether_line; ether_ntoa; > @@ -15,7 +15,7 @@ libc { > > # g* > getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname; > - getnetbyname_r; getnetent; getnetent_r; getnetgrent; getnetgrent_r; > + getnetbyname_r; getnetent; getnetent_r; > getprotobyname; getprotobyname_r; getprotobynumber; > getprotobynumber_r; getprotoent; getprotoent_r; > getservbyname; getservbyname_r; getservbyport; > @@ -36,7 +36,7 @@ libc { > rcmd; rexec; rresvport; ruserok; ruserpass; > > # s* > - setaliasent; setnetent; setnetgrent; setprotoent; setservent; > + setaliasent; setnetent; setprotoent; setservent; > } > GLIBC_2.1 { > # variables in normal name space > @@ -49,7 +49,7 @@ libc { > # g* > getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r; > gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r; > - getnetent_r; getnetgrent_r; getprotobyname_r; getprotobynumber_r; > + getnetent_r; getprotobyname_r; getprotobynumber_r; > getprotoent_r; getservbyname_r; > getservbyport_r; > getservent_r; > @@ -81,10 +81,6 @@ libc { > inet6_rth_segments; inet6_rth_getaddr; > } > GLIBC_PRIVATE { > - # functions used in other libraries > - __internal_endnetgrent; __internal_getnetgrent_r; > - __internal_setnetgrent; > - > # Used from nscd. > __inet6_scopeid_pton; > __idna_to_dns_encoding; > diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c > index 06b7d7b6ca..b9174a138c 100644 > --- a/nscd/netgroupcache.c > +++ b/nscd/netgroupcache.c > @@ -24,7 +24,7 @@ > #include > #include > > -#include "../inet/netgroup.h" > +#include "../nss/netgroup.h" > #include "nscd.h" > #include "dbg_log.h" > > diff --git a/nss/Makefile b/nss/Makefile > index d0b564a033..2a451f68d9 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -148,6 +148,17 @@ CFLAGS-gethstent.c += -fexceptions > CFLAGS-gethstent_r.c += -fexceptions > endif > > +# netgroup routines: > +routines += \ > + getnetgrent \ > + getnetgrent_r \ > + # routines > + > +ifeq ($(have-thread-library),yes) > +CFLAGS-getnetgrent.c += -fexceptions > +CFLAGS-getnetgrent_r.c += -fexceptions > +endif > + > # pwd routines: > routines += \ > fgetpwent \ > diff --git a/nss/Versions b/nss/Versions > index 74ba4470d8..4ddc018012 100644 > --- a/nss/Versions > +++ b/nss/Versions > @@ -8,6 +8,7 @@ libc { > > # e* > endgrent; > + endnetgrent; > endpwent; > endspent; > ether_hostton; ether_ntohost; > @@ -23,6 +24,7 @@ libc { > getgroups; > gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2; > gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r; > + getnetgrent; getnetgrent_r; > getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; > getspent; getspent_r; getspnam; getspnam_r; > > @@ -38,6 +40,7 @@ libc { > > # s* > setgrent; > + setnetgrent; > setpwent; > setspent; > sgetspent; sgetspent_r; > @@ -52,6 +55,7 @@ libc { > GLIBC_2.1.2 { > # g* > getgrent_r; getgrgid_r; getgrnam_r; > + getnetgrent_r; > getpwent_r; getpwuid_r; getpwnam_r; > getspent_r; getspnam_r; > } > @@ -181,6 +185,9 @@ libc { > _nss_files_init; > > __merge_grp; __copy_grp; > + > + __internal_endnetgrent; __internal_getnetgrent_r; > + __internal_setnetgrent; > } > } > > diff --git a/inet/getnetgrent.c b/nss/getnetgrent.c > similarity index 100% > rename from inet/getnetgrent.c > rename to nss/getnetgrent.c > diff --git a/inet/getnetgrent_r.c b/nss/getnetgrent_r.c > similarity index 100% > rename from inet/getnetgrent_r.c > rename to nss/getnetgrent_r.c > diff --git a/inet/netgroup.h b/nss/netgroup.h > similarity index 100% > rename from inet/netgroup.h > rename to nss/netgroup.h