Move 'aliases' routines from 'inet' into 'nss'

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.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Arjun Shankar 2023-10-02 14:55:19 +02:00
parent c6b577caef
commit 4298586619
10 changed files with 16 additions and 9 deletions

View File

@ -1,5 +1,5 @@
#ifndef _ALIASES_H #ifndef _ALIASES_H
#include <inet/aliases.h> #include <nss/aliases.h>
# ifndef _ISOMAC # ifndef _ISOMAC

View File

@ -24,7 +24,6 @@ include ../Makeconfig
headers := \ headers := \
$(wildcard arpa/*.h protocols/*.h) \ $(wildcard arpa/*.h protocols/*.h) \
aliases.h \
bits/in.h \ bits/in.h \
ifaddrs.h \ ifaddrs.h \
netinet/ether.h \ netinet/ether.h \
@ -49,10 +48,6 @@ routines := \
ether_ntoa \ ether_ntoa \
ether_ntoa_r \ ether_ntoa_r \
ether_ntoh \ ether_ntoh \
getaliasent \
getaliasent_r \
getaliasname \
getaliasname_r \
gethstbyad \ gethstbyad \
gethstbyad_r \ gethstbyad_r \
gethstbynm \ gethstbynm \
@ -176,8 +171,6 @@ CFLAGS-getnetbyad_r.c += -fexceptions
CFLAGS-getnetbyad.c += -fexceptions CFLAGS-getnetbyad.c += -fexceptions
CFLAGS-getnetent_r.c += -fexceptions CFLAGS-getnetent_r.c += -fexceptions
CFLAGS-getnetent.c += -fexceptions CFLAGS-getnetent.c += -fexceptions
CFLAGS-getaliasent_r.c += -fexceptions
CFLAGS-getaliasent.c += -fexceptions
CFLAGS-getrpcent_r.c += -fexceptions CFLAGS-getrpcent_r.c += -fexceptions
CFLAGS-getrpcent.c += -fexceptions CFLAGS-getrpcent.c += -fexceptions
CFLAGS-getservent_r.c += -fexceptions CFLAGS-getservent_r.c += -fexceptions

View File

@ -14,7 +14,6 @@ libc {
ether_ntoa_r; ether_ntohost; ether_ntoa_r; ether_ntohost;
# g* # g*
getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r;
getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname;
gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent; gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent;
gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname; gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname;

View File

@ -23,6 +23,7 @@ subdir := nss
include ../Makeconfig include ../Makeconfig
headers := \ headers := \
aliases.h \
grp.h \ grp.h \
gshadow.h \ gshadow.h \
nss.h \ nss.h \
@ -54,6 +55,19 @@ routines = \
valid_list_field \ valid_list_field \
# routines # 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: # grp routines:
routines += \ routines += \
fgetgrent \ fgetgrent \

View File

@ -17,6 +17,7 @@ libc {
fgetspent; fgetspent_r; fgetspent; fgetspent_r;
# g* # g*
getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r;
getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r; getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r;
getgroups; getgroups;
getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;