]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Move 'rpc' routines from 'inet' into 'nss'
authorArjun Shankar <arjun@redhat.com>
Mon, 2 Oct 2023 12:55:25 +0000 (14:55 +0200)
committerArjun Shankar <arjun@redhat.com>
Tue, 24 Oct 2023 10:31:00 +0000 (12:31 +0200)
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>
12 files changed:
inet/Makefile
nss/Makefile
nss/Versions
nss/getrpcbyname.c [moved from inet/getrpcbyname.c with 100% similarity]
nss/getrpcbyname_r.c [moved from inet/getrpcbyname_r.c with 100% similarity]
nss/getrpcbynumber.c [moved from inet/getrpcbynumber.c with 100% similarity]
nss/getrpcbynumber_r.c [moved from inet/getrpcbynumber_r.c with 100% similarity]
nss/getrpcent.c [moved from inet/getrpcent.c with 100% similarity]
nss/getrpcent_r.c [moved from inet/getrpcent_r.c with 100% similarity]
nss/test-rpcent.c [moved from sunrpc/test-rpcent.c with 100% similarity]
sunrpc/Makefile
sunrpc/Versions

index dab7182a11db872575601f4542b3dbb63a62011f..3c1987877aa2928f51f5a1fd94ca52fb891c57cb 100644 (file)
@@ -48,12 +48,6 @@ routines := \
   ether_ntoa_r \
   getipv4sourcefilter \
   getnameinfo \
-  getrpcbyname \
-  getrpcbyname_r \
-  getrpcbynumber \
-  getrpcbynumber_r \
-  getrpcent \
-  getrpcent_r \
   getservent \
   getservent_r \
   getsourcefilter \
@@ -132,8 +126,6 @@ include ../gen-locales.mk
 ifeq ($(have-thread-library),yes)
 
 CFLAGS-rcmd.c += -fexceptions
-CFLAGS-getrpcent_r.c += -fexceptions
-CFLAGS-getrpcent.c += -fexceptions
 CFLAGS-getservent_r.c += -fexceptions
 CFLAGS-getservent.c += -fexceptions
 CFLAGS-either_ntoh.c += -fexceptions
index df22d3655c97b49b9ee76d111de15e0e0c3db40e..cbfd5dc69235dbb3104e3ce40de651707c9079a1 100644 (file)
@@ -214,6 +214,21 @@ CFLAGS-getpwent.c += -fexceptions
 CFLAGS-getpwent_r.c += -fexceptions
 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
 routines += \
   fgetspent \
@@ -276,6 +291,7 @@ tests := \
   bug17079 \
   test-digits-dots \
   test-netdb \
+  test-rpcent \
   testgrp \
   tst-fgetsgent_r \
   tst-gethnm \
index c5de97fb53d8d6657835f58aecc6393fd829e0aa..b7491154bf87dabc8481b51efac256d036b76b52 100644 (file)
@@ -30,6 +30,8 @@ libc {
     getprotobyname; getprotobyname_r; getprotobynumber;
     getprotobynumber_r; getprotoent; getprotoent_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;
 
     # i*
similarity index 100%
rename from inet/getrpcbyname.c
rename to nss/getrpcbyname.c
similarity index 100%
rename from inet/getrpcbyname_r.c
rename to nss/getrpcbyname_r.c
similarity index 100%
rename from inet/getrpcbynumber.c
rename to nss/getrpcbynumber.c
similarity index 100%
rename from inet/getrpcent.c
rename to nss/getrpcent.c
similarity index 100%
rename from inet/getrpcent_r.c
rename to nss/getrpcent_r.c
similarity index 100%
rename from sunrpc/test-rpcent.c
rename to nss/test-rpcent.c
index ec2ea04ca9436da2990df5f3f6a88dcf14837173..83a0f2d099807ed19643b361758f7ba4f6ae0c58 100644 (file)
@@ -64,7 +64,7 @@ routines := auth_none authuxprot clnt_raw clnt_simp \
 shared-only-routines = $(routines)
 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
 
 xtests := tst-getmyaddr
index 77bc6a4c9b2b2e2948df0ce7ddb94212c93e85d6..cba6e36422deba0228898ae216ad231f2feec41d 100644 (file)
@@ -26,8 +26,7 @@ libc {
 
     # g*
     get_myaddress; getpublickey; getsecretkey;
-    getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r;
-    getrpcent; getrpcent_r; getrpcport;
+    getrpcport;
 
     # p*
     pmap_getmaps; pmap_getport; pmap_rmtcall; pmap_set; pmap_unset;