aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjun Shankar <arjun@redhat.com>2023-10-02 14:55:24 +0200
committerArjun Shankar <arjun@redhat.com>2023-10-24 12:30:59 +0200
commita25a060c358358d61d683dc8e9aa9df91e877a35 (patch)
treee01407aca6f3cf2a7891c428681314842aca5878
parent5a6e784e64c9e3d9b16b257f73cc6332771d9e18 (diff)
downloadglibc-a25a060c358358d61d683dc8e9aa9df91e877a35.tar
glibc-a25a060c358358d61d683dc8e9aa9df91e877a35.tar.gz
glibc-a25a060c358358d61d683dc8e9aa9df91e877a35.tar.bz2
glibc-a25a060c358358d61d683dc8e9aa9df91e877a35.zip
Move 'protocols' routines from 'inet' into 'nss'
The getprotoby* and getprotoent* 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>
-rw-r--r--inet/Makefile8
-rw-r--r--inet/Versions5
-rw-r--r--nss/Makefile15
-rw-r--r--nss/Versions3
-rw-r--r--nss/getproto.c (renamed from inet/getproto.c)0
-rw-r--r--nss/getproto_r.c (renamed from inet/getproto_r.c)0
-rw-r--r--nss/getprtent.c (renamed from inet/getprtent.c)0
-rw-r--r--nss/getprtent_r.c (renamed from inet/getprtent_r.c)0
-rw-r--r--nss/getprtname.c (renamed from inet/getprtname.c)0
-rw-r--r--nss/getprtname_r.c (renamed from inet/getprtname_r.c)0
10 files changed, 19 insertions, 12 deletions
diff --git a/inet/Makefile b/inet/Makefile
index 776cbfa0fd..dab7182a11 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -48,12 +48,6 @@ routines := \
ether_ntoa_r \
getipv4sourcefilter \
getnameinfo \
- getproto \
- getproto_r \
- getprtent \
- getprtent_r \
- getprtname \
- getprtname_r \
getrpcbyname \
getrpcbyname_r \
getrpcbynumber \
@@ -142,8 +136,6 @@ CFLAGS-getrpcent_r.c += -fexceptions
CFLAGS-getrpcent.c += -fexceptions
CFLAGS-getservent_r.c += -fexceptions
CFLAGS-getservent.c += -fexceptions
-CFLAGS-getprtent_r.c += -fexceptions
-CFLAGS-getprtent.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 051b305e48..c0c64e1543 100644
--- a/inet/Versions
+++ b/inet/Versions
@@ -15,8 +15,6 @@ libc {
# g*
getdomainname;
- getprotobyname; getprotobyname_r; getprotobynumber;
- getprotobynumber_r; getprotoent; getprotoent_r;
getservbyname; getservbyname_r; getservbyport;
getservbyport_r; getservent; getservent_r;
@@ -48,8 +46,7 @@ libc {
# g*
getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r;
gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r;
- getnetent_r; getprotobyname_r; getprotobynumber_r;
- getprotoent_r; getservbyname_r;
+ getnetent_r; getservbyname_r;
getservbyport_r;
getservent_r;
}
diff --git a/nss/Makefile b/nss/Makefile
index 023a11fa4b..df22d3655c 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -178,6 +178,21 @@ CFLAGS-getnetent.c += -fexceptions
CFLAGS-getnetent_r.c += -fexceptions
endif
+# protocols routines:
+routines += \
+ getproto \
+ getproto_r \
+ getprtent \
+ getprtent_r \
+ getprtname \
+ getprtname_r \
+ # routines
+
+ifeq ($(have-thread-library),yes)
+CFLAGS-getprtent_r.c += -fexceptions
+CFLAGS-getprtent.c += -fexceptions
+endif
+
# pwd routines:
routines += \
fgetpwent \
diff --git a/nss/Versions b/nss/Versions
index 95219f0fc7..c5de97fb53 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -27,6 +27,8 @@ libc {
getnetgrent; getnetgrent_r;
getnetbyaddr; getnetbyaddr_r; getnetbyname; getnetbyname_r;
getnetent; getnetent_r;
+ getprotobyname; getprotobyname_r; getprotobynumber;
+ getprotobynumber_r; getprotoent; getprotoent_r;
getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
getspent; getspent_r; getspnam; getspnam_r;
@@ -58,6 +60,7 @@ libc {
# g*
getgrent_r; getgrgid_r; getgrnam_r;
getnetgrent_r;
+ getprotobyname_r; getprotobynumber_r; getprotoent_r;
getpwent_r; getpwuid_r; getpwnam_r;
getspent_r; getspnam_r;
}
diff --git a/inet/getproto.c b/nss/getproto.c
index 297d67d26b..297d67d26b 100644
--- a/inet/getproto.c
+++ b/nss/getproto.c
diff --git a/inet/getproto_r.c b/nss/getproto_r.c
index 789d3dd34e..789d3dd34e 100644
--- a/inet/getproto_r.c
+++ b/nss/getproto_r.c
diff --git a/inet/getprtent.c b/nss/getprtent.c
index 83df7d89f9..83df7d89f9 100644
--- a/inet/getprtent.c
+++ b/nss/getprtent.c
diff --git a/inet/getprtent_r.c b/nss/getprtent_r.c
index 39975ca7e6..39975ca7e6 100644
--- a/inet/getprtent_r.c
+++ b/nss/getprtent_r.c
diff --git a/inet/getprtname.c b/nss/getprtname.c
index 8206347cfc..8206347cfc 100644
--- a/inet/getprtname.c
+++ b/nss/getprtname.c
diff --git a/inet/getprtname_r.c b/nss/getprtname_r.c
index a69d6a5680..a69d6a5680 100644
--- a/inet/getprtname_r.c
+++ b/nss/getprtname_r.c