From: Arjun Shankar <arjun@redhat.com>
To: libc-alpha@sourceware.org, Arjun Shankar <arjun@redhat.com>
Subject: [PATCH 14/16] Move 'services' routines from 'inet' into 'nss'
Date: Mon, 2 Oct 2023 14:55:26 +0200 [thread overview]
Message-ID: <20231002130150.1497733-15-arjun@redhat.com> (raw)
In-Reply-To: <20231002130150.1497733-1-arjun@redhat.com>
The getservby* and getservent* routines are entry points for nss
functionality. This commit moves them from the 'inet' subdirectory to
'nss'.
---
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(-)
rename {inet => nss}/getservent.c (100%)
rename {inet => nss}/getservent_r.c (100%)
rename {inet => nss}/getsrvbynm.c (100%)
rename {inet => nss}/getsrvbynm_r.c (100%)
rename {inet => nss}/getsrvbypt.c (100%)
rename {inet => nss}/getsrvbypt_r.c (100%)
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
--
2.41.0
next prev parent reply other threads:[~2023-10-02 13:02 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 12:55 [PATCH 00/16] Consolidate NSS functionality into nss subdir Arjun Shankar
2023-10-02 12:55 ` [PATCH 01/16] inet: Rearrange and sort Makefile variables Arjun Shankar
2023-10-02 14:11 ` Siddhesh Poyarekar
2023-10-02 12:55 ` [PATCH 02/16] nss: " Arjun Shankar
2023-10-02 14:12 ` Siddhesh Poyarekar
2023-10-02 12:55 ` [PATCH 03/16] Remove 'grp' and merge into 'nss' and 'posix' Arjun Shankar
2023-10-19 17:55 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 04/16] Remove 'gshadow' and merge into 'nss' Arjun Shankar
2023-10-19 18:15 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 05/16] Remove 'pwd' " Arjun Shankar
2023-10-19 18:29 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 06/16] Remove 'shadow' " Arjun Shankar
2023-10-19 18:44 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 07/16] Move 'aliases' routines from 'inet' " Arjun Shankar
2023-10-19 19:23 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 08/16] Move 'ethers' " Arjun Shankar
2023-10-19 19:39 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 09/16] Move 'hosts' " Arjun Shankar
2023-10-19 19:53 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 10/16] Move 'netgroup' " Arjun Shankar
2023-10-20 12:00 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 11/16] Move 'networks' " Arjun Shankar
2023-10-20 12:17 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 12/16] Move 'protocols' " Arjun Shankar
2023-10-20 12:32 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 13/16] Move 'rpc' " Arjun Shankar
2023-10-20 12:49 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` Arjun Shankar [this message]
2023-10-20 13:19 ` [PATCH 14/16] Move 'services' " Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 15/16] Move getaddrinfo from 'posix' " Arjun Shankar
2023-10-20 13:51 ` Adhemerval Zanella Netto
2023-10-24 21:32 ` Joseph Myers
2023-10-26 10:58 ` Arjun Shankar
2023-10-02 12:55 ` [PATCH 16/16] Move getnameinfo from 'inet' to 'nss' Arjun Shankar
2023-10-20 15:08 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231002130150.1497733-15-arjun@redhat.com \
--to=arjun@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).