[glibc] Move 'services' routines from 'inet' into 'nss'

[glibc] Move 'services' routines from 'inet' into 'nss'

[Arjun Shankar]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1d74d2f042a405982661267394e16126db70dc5f

commit 1d74d2f042a405982661267394e16126db70dc5f
Author: Arjun Shankar <arjun@redhat.com>
Date:   Mon Oct 2 14:55:26 2023 +0200

    Move 'services' routines from 'inet' into 'nss'
    
    The getservby* and getservent* routines are entry points for nss
    functionality.  This commit moves them from the 'inet' subdirectory to
    'nss'.
    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

Diff:
---
 inet/Makefile                |  8 --------
 inet/Versions                |  6 +-----
 nss/Makefile                 | 15 +++++++++++++++
 nss/Versions                 |  3 +++
 {inet => nss}/getservent.c   |  0
 {inet => nss}/getservent_r.c |  0
 {inet => nss}/getsrvbynm.c   |  0
 {inet => nss}/getsrvbynm_r.c |  0
 {inet => nss}/getsrvbypt.c   |  0
 {inet => nss}/getsrvbypt_r.c |  0
 10 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/inet/Makefile b/inet/Makefile
index 3c1987877a..d275f51b3f 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -48,13 +48,7 @@ routines := \
   ether_ntoa_r \
   getipv4sourcefilter \
   getnameinfo \
-  getservent \
-  getservent_r \
   getsourcefilter \
-  getsrvbynm \
-  getsrvbynm_r \
-  getsrvbypt \
-  getsrvbypt_r \
   herrno \
   herrno-loc \
   htonl \
@@ -126,8 +120,6 @@ include ../gen-locales.mk
 ifeq ($(have-thread-library),yes)
 
 CFLAGS-rcmd.c += -fexceptions
-CFLAGS-getservent_r.c += -fexceptions
-CFLAGS-getservent.c += -fexceptions
 CFLAGS-either_ntoh.c += -fexceptions
 CFLAGS-either_hton.c += -fexceptions
 CFLAGS-in6_addr.c += $(config-cflags-wno-ignored-attributes)
diff --git a/inet/Versions b/inet/Versions
index c0c64e1543..7765cb7722 100644
--- a/inet/Versions
+++ b/inet/Versions
@@ -15,8 +15,6 @@ libc {
 
     # g*
     getdomainname;
-    getservbyname; getservbyname_r; getservbyport;
-    getservbyport_r; getservent; getservent_r;
 
     # h*
     htonl; htons;
@@ -46,9 +44,7 @@ libc {
     # g*
     getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r;
     gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r;
-    getnetent_r; getservbyname_r;
-    getservbyport_r;
-    getservent_r;
+    getnetent_r;
   }
   GLIBC_2.2 {
     # i*
diff --git a/nss/Makefile b/nss/Makefile
index cbfd5dc692..e88754bf51 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -229,6 +229,21 @@ CFLAGS-getrpcent_r.c += -fexceptions
 CFLAGS-getrpcent.c += -fexceptions
 endif
 
+# services routines:
+routines += \
+  getservent \
+  getservent_r \
+  getsrvbynm \
+  getsrvbynm_r \
+  getsrvbypt \
+  getsrvbypt_r \
+  # routines
+
+ifeq ($(have-thread-library),yes)
+CFLAGS-getservent_r.c += -fexceptions
+CFLAGS-getservent.c += -fexceptions
+endif
+
 # shadow routines
 routines += \
   fgetspent \
diff --git a/nss/Versions b/nss/Versions
index b7491154bf..d8c4e373c9 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -32,6 +32,8 @@ libc {
     getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
     getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r;
     getrpcent; getrpcent_r;
+    getservbyname; getservbyname_r; getservbyport;
+    getservbyport_r; getservent; getservent_r;
     getspent; getspent_r; getspnam; getspnam_r;
 
     # i*
@@ -64,6 +66,7 @@ libc {
     getnetgrent_r;
     getprotobyname_r; getprotobynumber_r; getprotoent_r;
     getpwent_r; getpwuid_r; getpwnam_r;
+    getservbyname_r; getservbyport_r; getservent_r;
     getspent_r; getspnam_r;
   }
   GLIBC_2.2.2 {
diff --git a/inet/getservent.c b/nss/getservent.c
similarity index 100%
rename from inet/getservent.c
rename to nss/getservent.c
diff --git a/inet/getservent_r.c b/nss/getservent_r.c
similarity index 100%
rename from inet/getservent_r.c
rename to nss/getservent_r.c
diff --git a/inet/getsrvbynm.c b/nss/getsrvbynm.c
similarity index 100%
rename from inet/getsrvbynm.c
rename to nss/getsrvbynm.c
diff --git a/inet/getsrvbynm_r.c b/nss/getsrvbynm_r.c
similarity index 100%
rename from inet/getsrvbynm_r.c
rename to nss/getsrvbynm_r.c
diff --git a/inet/getsrvbypt.c b/nss/getsrvbypt.c
similarity index 100%
rename from inet/getsrvbypt.c
rename to nss/getsrvbypt.c
diff --git a/inet/getsrvbypt_r.c b/nss/getsrvbypt_r.c
similarity index 100%
rename from inet/getsrvbypt_r.c
rename to nss/getsrvbypt_r.c