From: Arjun Shankar <arjun@redhat.com>
To: libc-alpha@sourceware.org, Arjun Shankar <arjun@redhat.com>
Subject: [PATCH 13/16] Move 'rpc' routines from 'inet' into 'nss'
Date: Mon, 2 Oct 2023 14:55:25 +0200 [thread overview]
Message-ID: <20231002130150.1497733-14-arjun@redhat.com> (raw)
In-Reply-To: <20231002130150.1497733-1-arjun@redhat.com>
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%)
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;
--
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 ` Arjun Shankar [this message]
2023-10-20 12:49 ` [PATCH 13/16] Move 'rpc' " Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 14/16] Move 'services' " Arjun Shankar
2023-10-20 13:19 ` 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-14-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).