| Message ID | 20231002130150.1497733-8-arjun@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Consolidate NSS functionality into nss subdir | expand |
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
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
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. --- 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%)