From: Arjun Shankar <arjun@redhat.com>
To: libc-alpha@sourceware.org, Arjun Shankar <arjun@redhat.com>
Subject: [PATCH 09/16] Move 'hosts' routines from 'inet' into 'nss'
Date: Mon, 2 Oct 2023 14:55:21 +0200 [thread overview]
Message-ID: <20231002130150.1497733-10-arjun@redhat.com> (raw)
In-Reply-To: <20231002130150.1497733-1-arjun@redhat.com>
The gethostby* and gethostent* routines are entry points for nss
functionality. This commit moves them from the 'inet' subdirectory to
'nss'.
---
inet/Makefile | 17 -----------------
inet/Versions | 4 +---
nss/Makefile | 24 ++++++++++++++++++++++++
nss/Versions | 2 ++
{inet => nss}/gethstbyad.c | 0
{inet => nss}/gethstbyad_r.c | 0
{inet => nss}/gethstbynm.c | 0
{inet => nss}/gethstbynm2.c | 0
{inet => nss}/gethstbynm2_r.c | 0
{inet => nss}/gethstbynm_r.c | 0
{inet => nss}/gethstent.c | 0
{inet => nss}/gethstent_r.c | 0
{inet => nss}/tst-gethnm.c | 0
13 files changed, 27 insertions(+), 20 deletions(-)
rename {inet => nss}/gethstbyad.c (100%)
rename {inet => nss}/gethstbyad_r.c (100%)
rename {inet => nss}/gethstbynm.c (100%)
rename {inet => nss}/gethstbynm2.c (100%)
rename {inet => nss}/gethstbynm2_r.c (100%)
rename {inet => nss}/gethstbynm_r.c (100%)
rename {inet => nss}/gethstent.c (100%)
rename {inet => nss}/gethstent_r.c (100%)
rename {inet => nss}/tst-gethnm.c (100%)
diff --git a/inet/Makefile b/inet/Makefile
index 4d053de748..d378542549 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -46,14 +46,6 @@ routines := \
ether_line \
ether_ntoa \
ether_ntoa_r \
- gethstbyad \
- gethstbyad_r \
- gethstbynm \
- gethstbynm2 \
- gethstbynm2_r \
- gethstbynm_r \
- gethstent \
- gethstent_r \
getipv4sourcefilter \
getnameinfo \
getnetbyad \
@@ -123,7 +115,6 @@ tests := \
tst-checks-posix \
tst-ether_aton \
tst-ether_line \
- tst-gethnm \
tst-getni1 \
tst-getni2 \
tst-if_index-long \
@@ -154,14 +145,6 @@ include ../gen-locales.mk
ifeq ($(have-thread-library),yes)
-CFLAGS-gethstbyad_r.c += -fexceptions
-CFLAGS-gethstbyad.c += -fexceptions
-CFLAGS-gethstbynm_r.c += -fexceptions
-CFLAGS-gethstbynm.c += -fexceptions
-CFLAGS-gethstbynm2_r.c += -fexceptions
-CFLAGS-gethstbynm2.c += -fexceptions
-CFLAGS-gethstent_r.c += -fexceptions
-CFLAGS-gethstent.c += -fexceptions
CFLAGS-rcmd.c += -fexceptions
CFLAGS-getnetbynm_r.c += -fexceptions
CFLAGS-getnetbynm.c += -fexceptions
diff --git a/inet/Versions b/inet/Versions
index a7c1a0fb6f..d937e9835c 100644
--- a/inet/Versions
+++ b/inet/Versions
@@ -14,9 +14,7 @@ libc {
ether_ntoa_r;
# g*
- getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname;
- gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent;
- gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname;
+ getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname;
getnetbyname_r; getnetent; getnetent_r; getnetgrent; getnetgrent_r;
getprotobyname; getprotobyname_r; getprotobynumber;
getprotobynumber_r; getprotoent; getprotoent_r;
diff --git a/nss/Makefile b/nss/Makefile
index 148c6dc1cf..d0b564a033 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -125,6 +125,29 @@ CFLAGS-getsgnam.c += -fexceptions
CFLAGS-getsgnam_r.c += -fexceptions
endif
+# hosts routines:
+routines += \
+ gethstbyad \
+ gethstbyad_r \
+ gethstbynm \
+ gethstbynm2 \
+ gethstbynm2_r \
+ gethstbynm_r \
+ gethstent \
+ gethstent_r \
+ # routines
+
+ifeq ($(have-thread-library),yes)
+CFLAGS-gethstbyad.c += -fexceptions
+CFLAGS-gethstbyad_r.c += -fexceptions
+CFLAGS-gethstbynm.c += -fexceptions
+CFLAGS-gethstbynm_r.c += -fexceptions
+CFLAGS-gethstbynm2.c += -fexceptions
+CFLAGS-gethstbynm2_r.c += -fexceptions
+CFLAGS-gethstent.c += -fexceptions
+CFLAGS-gethstent_r.c += -fexceptions
+endif
+
# pwd routines:
routines += \
fgetpwent \
@@ -210,6 +233,7 @@ tests := \
test-netdb \
testgrp \
tst-fgetsgent_r \
+ tst-gethnm \
tst-getpw \
tst-gshadow \
tst-nss-getpwent \
diff --git a/nss/Versions b/nss/Versions
index 99208cb9df..74ba4470d8 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -21,6 +21,8 @@ libc {
getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r;
getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r;
getgroups;
+ gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2;
+ gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r;
getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
getspent; getspent_r; getspnam; getspnam_r;
diff --git a/inet/gethstbyad.c b/nss/gethstbyad.c
similarity index 100%
rename from inet/gethstbyad.c
rename to nss/gethstbyad.c
diff --git a/inet/gethstbyad_r.c b/nss/gethstbyad_r.c
similarity index 100%
rename from inet/gethstbyad_r.c
rename to nss/gethstbyad_r.c
diff --git a/inet/gethstbynm.c b/nss/gethstbynm.c
similarity index 100%
rename from inet/gethstbynm.c
rename to nss/gethstbynm.c
diff --git a/inet/gethstbynm2.c b/nss/gethstbynm2.c
similarity index 100%
rename from inet/gethstbynm2.c
rename to nss/gethstbynm2.c
diff --git a/inet/gethstbynm2_r.c b/nss/gethstbynm2_r.c
similarity index 100%
rename from inet/gethstbynm2_r.c
rename to nss/gethstbynm2_r.c
diff --git a/inet/gethstbynm_r.c b/nss/gethstbynm_r.c
similarity index 100%
rename from inet/gethstbynm_r.c
rename to nss/gethstbynm_r.c
diff --git a/inet/gethstent.c b/nss/gethstent.c
similarity index 100%
rename from inet/gethstent.c
rename to nss/gethstent.c
diff --git a/inet/gethstent_r.c b/nss/gethstent_r.c
similarity index 100%
rename from inet/gethstent_r.c
rename to nss/gethstent_r.c
diff --git a/inet/tst-gethnm.c b/nss/tst-gethnm.c
similarity index 100%
rename from inet/tst-gethnm.c
rename to nss/tst-gethnm.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 ` Arjun Shankar [this message]
2023-10-19 19:53 ` [PATCH 09/16] Move 'hosts' " 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 ` [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-10-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).