Move 'rpc' routines from 'inet' into 'nss'

The getrpcby* and getrpcent* routines are entry points for nss
functionality.  This commit moves them from the 'inet' subdirectory to
'nss'.  The Versions entries for these routines along with a test,
located in the 'sunrpc' subdirectory, are also moved into 'nss'.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Arjun Shankar 2023-10-02 14:55:25 +02:00
parent a25a060c35
commit 9b63a8ac40
12 changed files with 20 additions and 11 deletions

View File

@ -48,12 +48,6 @@ routines := \
ether_ntoa_r \ ether_ntoa_r \
getipv4sourcefilter \ getipv4sourcefilter \
getnameinfo \ getnameinfo \
getrpcbyname \
getrpcbyname_r \
getrpcbynumber \
getrpcbynumber_r \
getrpcent \
getrpcent_r \
getservent \ getservent \
getservent_r \ getservent_r \
getsourcefilter \ getsourcefilter \
@ -132,8 +126,6 @@ include ../gen-locales.mk
ifeq ($(have-thread-library),yes) ifeq ($(have-thread-library),yes)
CFLAGS-rcmd.c += -fexceptions CFLAGS-rcmd.c += -fexceptions
CFLAGS-getrpcent_r.c += -fexceptions
CFLAGS-getrpcent.c += -fexceptions
CFLAGS-getservent_r.c += -fexceptions CFLAGS-getservent_r.c += -fexceptions
CFLAGS-getservent.c += -fexceptions CFLAGS-getservent.c += -fexceptions
CFLAGS-either_ntoh.c += -fexceptions CFLAGS-either_ntoh.c += -fexceptions

View File

@ -214,6 +214,21 @@ CFLAGS-getpwent.c += -fexceptions
CFLAGS-getpwent_r.c += -fexceptions CFLAGS-getpwent_r.c += -fexceptions
endif endif
# rpc routines:
routines += \
getrpcbyname \
getrpcbyname_r \
getrpcbynumber \
getrpcbynumber_r \
getrpcent \
getrpcent_r \
# routines
ifeq ($(have-thread-library),yes)
CFLAGS-getrpcent_r.c += -fexceptions
CFLAGS-getrpcent.c += -fexceptions
endif
# shadow routines # shadow routines
routines += \ routines += \
fgetspent \ fgetspent \
@ -276,6 +291,7 @@ tests := \
bug17079 \ bug17079 \
test-digits-dots \ test-digits-dots \
test-netdb \ test-netdb \
test-rpcent \
testgrp \ testgrp \
tst-fgetsgent_r \ tst-fgetsgent_r \
tst-gethnm \ tst-gethnm \

View File

@ -30,6 +30,8 @@ libc {
getprotobyname; getprotobyname_r; getprotobynumber; getprotobyname; getprotobyname_r; getprotobynumber;
getprotobynumber_r; getprotoent; getprotoent_r; getprotobynumber_r; getprotoent; getprotoent_r;
getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r;
getrpcent; getrpcent_r;
getspent; getspent_r; getspnam; getspnam_r; getspent; getspent_r; getspnam; getspnam_r;
# i* # i*

View File

@ -64,7 +64,7 @@ routines := auth_none authuxprot clnt_raw clnt_simp \
shared-only-routines = $(routines) shared-only-routines = $(routines)
endif endif
tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error tst-udp-timeout \ tests = tst-xdrmem tst-xdrmem2 tst-udp-error tst-udp-timeout \
tst-udp-nonblocking tst-bug22542 tst-bug28768 tst-udp-nonblocking tst-bug22542 tst-bug28768
xtests := tst-getmyaddr xtests := tst-getmyaddr

View File

@ -26,8 +26,7 @@ libc {
# g* # g*
get_myaddress; getpublickey; getsecretkey; get_myaddress; getpublickey; getsecretkey;
getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r; getrpcport;
getrpcent; getrpcent_r; getrpcport;
# p* # p*
pmap_getmaps; pmap_getport; pmap_rmtcall; pmap_set; pmap_unset; pmap_getmaps; pmap_getport; pmap_rmtcall; pmap_set; pmap_unset;