From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Arjun Shankar <arjun@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 07/16] Move 'aliases' routines from 'inet' into 'nss'
Date: Thu, 19 Oct 2023 16:23:32 -0300 [thread overview]
Message-ID: <9d623890-3dcd-4670-8501-5e28d227dc09@linaro.org> (raw)
In-Reply-To: <20231002130150.1497733-8-arjun@redhat.com>
On 02/10/23 09:55, Arjun Shankar wrote:
> The aliases routines are entry points for nss functionality. This
> commit moves aliases.h and the aliases routines from the 'inet'
> subdirectory to 'nss', and adjusts any external references.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> include/aliases.h | 2 +-
> inet/Makefile | 7 -------
> inet/Versions | 1 -
> nss/Makefile | 14 ++++++++++++++
> nss/Versions | 1 +
> {inet => nss}/aliases.h | 0
> {inet => nss}/getaliasent.c | 0
> {inet => nss}/getaliasent_r.c | 0
> {inet => nss}/getaliasname.c | 0
> {inet => nss}/getaliasname_r.c | 0
> 10 files changed, 16 insertions(+), 9 deletions(-)
> rename {inet => nss}/aliases.h (100%)
> rename {inet => nss}/getaliasent.c (100%)
> rename {inet => nss}/getaliasent_r.c (100%)
> rename {inet => nss}/getaliasname.c (100%)
> rename {inet => nss}/getaliasname_r.c (100%)
>
> diff --git a/include/aliases.h b/include/aliases.h
> index db82588630..2c7756efe8 100644
> --- a/include/aliases.h
> +++ b/include/aliases.h
> @@ -1,5 +1,5 @@
> #ifndef _ALIASES_H
> -#include <inet/aliases.h>
> +#include <nss/aliases.h>
>
> # ifndef _ISOMAC
>
> diff --git a/inet/Makefile b/inet/Makefile
> index 9db7f941c6..bd3dc58322 100644
> --- a/inet/Makefile
> +++ b/inet/Makefile
> @@ -24,7 +24,6 @@ include ../Makeconfig
>
> headers := \
> $(wildcard arpa/*.h protocols/*.h) \
> - aliases.h \
> bits/in.h \
> ifaddrs.h \
> netinet/ether.h \
> @@ -49,10 +48,6 @@ routines := \
> ether_ntoa \
> ether_ntoa_r \
> ether_ntoh \
> - getaliasent \
> - getaliasent_r \
> - getaliasname \
> - getaliasname_r \
> gethstbyad \
> gethstbyad_r \
> gethstbynm \
> @@ -176,8 +171,6 @@ CFLAGS-getnetbyad_r.c += -fexceptions
> CFLAGS-getnetbyad.c += -fexceptions
> CFLAGS-getnetent_r.c += -fexceptions
> CFLAGS-getnetent.c += -fexceptions
> -CFLAGS-getaliasent_r.c += -fexceptions
> -CFLAGS-getaliasent.c += -fexceptions
> CFLAGS-getrpcent_r.c += -fexceptions
> CFLAGS-getrpcent.c += -fexceptions
> CFLAGS-getservent_r.c += -fexceptions
> diff --git a/inet/Versions b/inet/Versions
> index 84cbe847cd..e6d1e6f1ba 100644
> --- a/inet/Versions
> +++ b/inet/Versions
> @@ -14,7 +14,6 @@ libc {
> ether_ntoa_r; ether_ntohost;
>
> # g*
> - getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r;
> getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname;
> gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent;
> gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname;
> diff --git a/nss/Makefile b/nss/Makefile
> index 84cf62af2b..2dfa7ebef9 100644
> --- a/nss/Makefile
> +++ b/nss/Makefile
> @@ -23,6 +23,7 @@ subdir := nss
> include ../Makeconfig
>
> headers := \
> + aliases.h \
> grp.h \
> gshadow.h \
> nss.h \
> @@ -54,6 +55,19 @@ routines = \
> valid_list_field \
> # routines
>
> +# alias routines:
> +routines += \
> + getaliasent \
> + getaliasent_r \
> + getaliasname \
> + getaliasname_r \
> + # routines
> +
> +ifeq ($(have-thread-library),yes)
> +CFLAGS-getaliasent_r.c += -fexceptions
> +CFLAGS-getaliasent.c += -fexceptions
> +endif
> +
> # grp routines:
> routines += \
> fgetgrent \
> diff --git a/nss/Versions b/nss/Versions
> index 632af25be4..5d1b1dac3d 100644
> --- a/nss/Versions
> +++ b/nss/Versions
> @@ -17,6 +17,7 @@ libc {
> fgetspent; fgetspent_r;
>
> # g*
> + getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r;
> getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r;
> getgroups;
> getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
> diff --git a/inet/aliases.h b/nss/aliases.h
> similarity index 100%
> rename from inet/aliases.h
> rename to nss/aliases.h
> diff --git a/inet/getaliasent.c b/nss/getaliasent.c
> similarity index 100%
> rename from inet/getaliasent.c
> rename to nss/getaliasent.c
> diff --git a/inet/getaliasent_r.c b/nss/getaliasent_r.c
> similarity index 100%
> rename from inet/getaliasent_r.c
> rename to nss/getaliasent_r.c
> diff --git a/inet/getaliasname.c b/nss/getaliasname.c
> similarity index 100%
> rename from inet/getaliasname.c
> rename to nss/getaliasname.c
> diff --git a/inet/getaliasname_r.c b/nss/getaliasname_r.c
> similarity index 100%
> rename from inet/getaliasname_r.c
> rename to nss/getaliasname_r.c
next prev parent reply other threads:[~2023-10-19 19:23 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 [this message]
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
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=9d623890-3dcd-4670-8501-5e28d227dc09@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).