From: Arjun Shankar <arjun@redhat.com>
Date: Mon, 2 Oct 2023 12:55:25 +0000 (+0200)
Subject: Move 'rpc' routines from 'inet' into 'nss'
X-Git-Tag: glibc-2.39~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b63a8ac404733851798680da1dc9f53ee70b64c;p=thirdparty%2Fglibc.git

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>
---

diff --git a/inet/Makefile b/inet/Makefile
index dab7182a11d..3c1987877aa 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -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
diff --git a/nss/Makefile b/nss/Makefile
index df22d3655c9..cbfd5dc6923 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -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 \
diff --git a/nss/Versions b/nss/Versions
index c5de97fb53d..b7491154bf8 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -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*
diff --git a/inet/getrpcbyname.c b/nss/getrpcbyname.c
similarity index 100%
rename from inet/getrpcbyname.c
rename to nss/getrpcbyname.c
diff --git a/inet/getrpcbyname_r.c b/nss/getrpcbyname_r.c
similarity index 100%
rename from inet/getrpcbyname_r.c
rename to nss/getrpcbyname_r.c
diff --git a/inet/getrpcbynumber.c b/nss/getrpcbynumber.c
similarity index 100%
rename from inet/getrpcbynumber.c
rename to nss/getrpcbynumber.c
diff --git a/inet/getrpcbynumber_r.c b/nss/getrpcbynumber_r.c
similarity index 100%
rename from inet/getrpcbynumber_r.c
rename to nss/getrpcbynumber_r.c
diff --git a/inet/getrpcent.c b/nss/getrpcent.c
similarity index 100%
rename from inet/getrpcent.c
rename to nss/getrpcent.c
diff --git a/inet/getrpcent_r.c b/nss/getrpcent_r.c
similarity index 100%
rename from inet/getrpcent_r.c
rename to nss/getrpcent_r.c
diff --git a/sunrpc/test-rpcent.c b/nss/test-rpcent.c
similarity index 100%
rename from sunrpc/test-rpcent.c
rename to nss/test-rpcent.c
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index ec2ea04ca94..83a0f2d0998 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -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
diff --git a/sunrpc/Versions b/sunrpc/Versions
index 77bc6a4c9b2..cba6e36422d 100644
--- a/sunrpc/Versions
+++ b/sunrpc/Versions
@@ -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;