AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move non-deprecated RPC-related functions from sunrpc to inet

Browse Source 
This includes bindresvport and the NSS-related RPC functions.  This will
simplify the removal of the sunrpc functionality because these functions
no longer have to be treated specially.
This commit is contained in:
Florian Weimer 2020-07-08 12:15:23 +02:00
parent a2a83bf6d9
commit acb527929d
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inet/Makefile
View File

@ -36,10 +36,11 @@ routines := htonl htons \
getnetbynm_r \ getnetbynm_r \
getproto getproto_r getprtent getprtent_r getprtname getprtname_r \ getproto getproto_r getprtent getprtent_r getprtname getprtname_r \
getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \ getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \
getservent_r \ getservent_r getrpcent getrpcbyname getrpcbynumber \
getrpcent_r getrpcbyname_r getrpcbynumber_r \
ether_aton ether_aton_r ether_hton ether_line \ ether_aton ether_aton_r ether_hton ether_line \
ether_ntoa ether_ntoa_r ether_ntoh \ ether_ntoa ether_ntoa_r ether_ntoh \
rcmd rexec ruserpass \ rcmd rexec ruserpass bindresvport \
getnetgrent_r getnetgrent \ getnetgrent_r getnetgrent \
getaliasent_r getaliasent getaliasname getaliasname_r \ getaliasent_r getaliasent getaliasname getaliasname_r \
in6_addr getnameinfo if_index ifaddrs inet6_option \ in6_addr getnameinfo if_index ifaddrs inet6_option \
@ -47,6 +48,8 @@ routines := htonl htons \
getsourcefilter setsourcefilter inet6_opt inet6_rth \ getsourcefilter setsourcefilter inet6_opt inet6_rth \
inet6_scopeid_pton deadline idna idna_name_classify inet6_scopeid_pton deadline idna idna_name_classify
install-others = $(inst_sysconfdir)/rpc
aux := check_pf check_native ifreq aux := check_pf check_native ifreq
tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
@ -108,6 +111,10 @@ CFLAGS-tst-sockaddr.c += -fno-strict-aliasing
endif endif
# Install the rpc database file.
$(inst_sysconfdir)/rpc: etc.rpc $(+force)
$(do-install)
ifeq ($(build-static-nss),yes) ifeq ($(build-static-nss),yes)
CFLAGS += -DSTATIC_NSS CFLAGS += -DSTATIC_NSS
endif endif

0
sunrpc/bindrsvprt.c → inet/bindresvport.c
View File

0
sunrpc/etc.rpc → inet/etc.rpc
View File

0
sunrpc/getrpcbyname.c → inet/getrpcbyname.c
View File

0
sunrpc/getrpcbyname_r.c → inet/getrpcbyname_r.c
View File

0
sunrpc/getrpcbynumber.c → inet/getrpcbynumber.c
View File

0
sunrpc/getrpcbynumber_r.c → inet/getrpcbynumber_r.c
View File

0
sunrpc/getrpcent.c → inet/getrpcent.c
View File

0
sunrpc/getrpcent_r.c → inet/getrpcent_r.c
View File

9
sunrpc/Makefile
View File

@ -32,7 +32,6 @@ include ../Makeconfig
# file name limits: # file name limits:
# #
# authunix_prot.c -> authuxprot.c # authunix_prot.c -> authuxprot.c
# bindresvport.c -> bindrsvprt.c
# clnt_generic.c -> clnt_gen.c # clnt_generic.c -> clnt_gen.c
# clnt_perror.c -> clnt_perr.c # clnt_perror.c -> clnt_perr.c
# clnt_simple.c -> clnt_simp.c # clnt_simple.c -> clnt_simp.c
@ -54,7 +53,6 @@ headers-sunrpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
key_prot.h) \ key_prot.h) \
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
headers = rpc/netdb.h headers = rpc/netdb.h
install-others = $(inst_sysconfdir)/rpc
generated += $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ generated += $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
generated-dirs += rpcsvc generated-dirs += rpcsvc
@ -70,13 +68,11 @@ need-export-routines := auth_des auth_unix clnt_gen clnt_perr clnt_tcp \
xdr_intXX_t xdr_mem xdr_ref xdr_sizeof xdr_stdio \ xdr_intXX_t xdr_mem xdr_ref xdr_sizeof xdr_stdio \
svc_run svc_run
routines := auth_none authuxprot bindrsvprt clnt_raw clnt_simp \ routines := auth_none authuxprot clnt_raw clnt_simp \
rpc_dtable getrpcport pmap_clnt pm_getmaps pmap_prot pmap_prot2 \ rpc_dtable getrpcport pmap_clnt pm_getmaps pmap_prot pmap_prot2 \
pmap_rmt rpc_prot rpc_common rpc_cmsg svc_auth svc_authux svc_raw \ pmap_rmt rpc_prot rpc_common rpc_cmsg svc_auth svc_authux svc_raw \
svc_simple xdr_float xdr_rec publickey authdes_prot \ svc_simple xdr_float xdr_rec publickey authdes_prot \
des_crypt des_impl des_soft key_prot openchild rtime svcauth_des \ des_crypt des_impl des_soft key_prot openchild rtime svcauth_des \
getrpcent getrpcbyname getrpcbynumber \
getrpcent_r getrpcbyname_r getrpcbynumber_r \
clnt_unix svc_unix create_xid $(need-export-routines) \ clnt_unix svc_unix create_xid $(need-export-routines) \
rpc_gethostbyname rpc_gethostbyname
ifneq ($(link-obsolete-rpc),yes) ifneq ($(link-obsolete-rpc),yes)
@ -188,9 +184,6 @@ include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
# binary be the second dependency listed in each rule using rpcgen-cmd. # binary be the second dependency listed in each rule using rpcgen-cmd.
rpcgen-cmd = CPP='$(CC) -E -x c-header' $(built-program-file) -Y ../scripts rpcgen-cmd = CPP='$(CC) -E -x c-header' $(built-program-file) -Y ../scripts
# Install the rpc data base file.
$(inst_sysconfdir)/rpc: etc.rpc $(+force)
$(do-install)
# Generate the rpcsvc headers with rpcgen. # Generate the rpcsvc headers with rpcgen.
# We use a stamp file to avoid unnessary recompilation each time rpcgen is # We use a stamp file to avoid unnessary recompilation each time rpcgen is