diff mbox series

[13/16] Move 'rpc' routines from 'inet' into 'nss'

Message ID 20231002130150.1497733-14-arjun@redhat.com
State Committed
Commit 9b63a8ac404733851798680da1dc9f53ee70b64c
Headers
Series Consolidate NSS functionality into nss subdir |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm fail Testing failed

Commit Message

Arjun Shankar Oct. 2, 2023, 12:55 p.m. UTC 
  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'.
---
 inet/Makefile                    |  8 --------
 nss/Makefile                     | 16 ++++++++++++++++
 nss/Versions                     |  2 ++
 {inet => nss}/getrpcbyname.c     |  0
 {inet => nss}/getrpcbyname_r.c   |  0
 {inet => nss}/getrpcbynumber.c   |  0
 {inet => nss}/getrpcbynumber_r.c |  0
 {inet => nss}/getrpcent.c        |  0
 {inet => nss}/getrpcent_r.c      |  0
 {sunrpc => nss}/test-rpcent.c    |  0
 sunrpc/Makefile                  |  2 +-
 sunrpc/Versions                  |  3 +--
 12 files changed, 20 insertions(+), 11 deletions(-)
 rename {inet => nss}/getrpcbyname.c (100%)
 rename {inet => nss}/getrpcbyname_r.c (100%)
 rename {inet => nss}/getrpcbynumber.c (100%)
 rename {inet => nss}/getrpcbynumber_r.c (100%)
 rename {inet => nss}/getrpcent.c (100%)
 rename {inet => nss}/getrpcent_r.c (100%)
 rename {sunrpc => nss}/test-rpcent.c (100%)

Comments

Adhemerval Zanella Netto Oct. 20, 2023, 12:49 p.m. UTC | #1 
On 02/10/23 09:55, Arjun Shankar wrote:
> 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'.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  inet/Makefile                    |  8 --------
>  nss/Makefile                     | 16 ++++++++++++++++
>  nss/Versions                     |  2 ++
>  {inet => nss}/getrpcbyname.c     |  0
>  {inet => nss}/getrpcbyname_r.c   |  0
>  {inet => nss}/getrpcbynumber.c   |  0
>  {inet => nss}/getrpcbynumber_r.c |  0
>  {inet => nss}/getrpcent.c        |  0
>  {inet => nss}/getrpcent_r.c      |  0
>  {sunrpc => nss}/test-rpcent.c    |  0
>  sunrpc/Makefile                  |  2 +-
>  sunrpc/Versions                  |  3 +--
>  12 files changed, 20 insertions(+), 11 deletions(-)
>  rename {inet => nss}/getrpcbyname.c (100%)
>  rename {inet => nss}/getrpcbyname_r.c (100%)
>  rename {inet => nss}/getrpcbynumber.c (100%)
>  rename {inet => nss}/getrpcbynumber_r.c (100%)
>  rename {inet => nss}/getrpcent.c (100%)
>  rename {inet => nss}/getrpcent_r.c (100%)
>  rename {sunrpc => nss}/test-rpcent.c (100%)
> 
> diff --git a/inet/Makefile b/inet/Makefile
> index dab7182a11..3c1987877a 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 df22d3655c..cbfd5dc692 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 c5de97fb53..b7491154bf 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 ec2ea04ca9..83a0f2d099 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 77bc6a4c9b..cba6e36422 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;
diff mbox series

Patch

diff --git a/inet/Makefile b/inet/Makefile
index dab7182a11..3c1987877a 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 df22d3655c..cbfd5dc692 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 c5de97fb53..b7491154bf 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 ec2ea04ca9..83a0f2d099 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 77bc6a4c9b..cba6e36422 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;