From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Arjun Shankar <arjun@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 10/16] Move 'netgroup' routines from 'inet' into 'nss'
Date: Fri, 20 Oct 2023 09:00:18 -0300 [thread overview]
Message-ID: <f719a8f1-dc7d-4887-942a-5c1889c759f7@linaro.org> (raw)
In-Reply-To: <20231002130150.1497733-11-arjun@redhat.com>
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 <adhemerval.zanella@linaro.org>
> ---
> 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 <inet/netgroup.h>
> +#include <nss/netgroup.h>
>
> 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 <inet/netgroup.h>
> +#include <nss/netgroup.h>
> 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 <unistd.h>
> #include <sys/mman.h>
>
> -#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
next prev parent reply other threads:[~2023-10-20 12:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 12:55 [PATCH 00/16] Consolidate NSS functionality into nss subdir Arjun Shankar
2023-10-02 12:55 ` [PATCH 01/16] inet: Rearrange and sort Makefile variables Arjun Shankar
2023-10-02 14:11 ` Siddhesh Poyarekar
2023-10-02 12:55 ` [PATCH 02/16] nss: " Arjun Shankar
2023-10-02 14:12 ` Siddhesh Poyarekar
2023-10-02 12:55 ` [PATCH 03/16] Remove 'grp' and merge into 'nss' and 'posix' Arjun Shankar
2023-10-19 17:55 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 04/16] Remove 'gshadow' and merge into 'nss' Arjun Shankar
2023-10-19 18:15 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 05/16] Remove 'pwd' " Arjun Shankar
2023-10-19 18:29 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 06/16] Remove 'shadow' " Arjun Shankar
2023-10-19 18:44 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 07/16] Move 'aliases' routines from 'inet' " Arjun Shankar
2023-10-19 19:23 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 08/16] Move 'ethers' " Arjun Shankar
2023-10-19 19:39 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 09/16] Move 'hosts' " Arjun Shankar
2023-10-19 19:53 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 10/16] Move 'netgroup' " Arjun Shankar
2023-10-20 12:00 ` Adhemerval Zanella Netto [this message]
2023-10-02 12:55 ` [PATCH 11/16] Move 'networks' " Arjun Shankar
2023-10-20 12:17 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 12/16] Move 'protocols' " Arjun Shankar
2023-10-20 12:32 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 13/16] Move 'rpc' " Arjun Shankar
2023-10-20 12:49 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 14/16] Move 'services' " Arjun Shankar
2023-10-20 13:19 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 15/16] Move getaddrinfo from 'posix' " Arjun Shankar
2023-10-20 13:51 ` Adhemerval Zanella Netto
2023-10-24 21:32 ` Joseph Myers
2023-10-26 10:58 ` Arjun Shankar
2023-10-02 12:55 ` [PATCH 16/16] Move getnameinfo from 'inet' to 'nss' Arjun Shankar
2023-10-20 15:08 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f719a8f1-dc7d-4887-942a-5c1889c759f7@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=arjun@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).