From: Arjun Shankar <arjun@redhat.com>
To: libc-alpha@sourceware.org, Arjun Shankar <arjun@redhat.com>
Subject: [PATCH 08/16] Move 'ethers' routines from 'inet' into 'nss'
Date: Mon, 2 Oct 2023 14:55:20 +0200 [thread overview]
Message-ID: <20231002130150.1497733-9-arjun@redhat.com> (raw)
In-Reply-To: <20231002130150.1497733-1-arjun@redhat.com>
ether_hostton and ether_ntohost are entry points for nss functionality.
This commit moves them from the 'inet' subdirectory to 'nss', and
adjusts any references accordingly.
---
inet/Makefile | 2 --
inet/Versions | 4 ++--
nss/Makefile | 6 ++++++
nss/Versions | 1 +
{inet => nss}/ether_hton.c | 2 +-
{inet => nss}/ether_ntoh.c | 2 +-
6 files changed, 11 insertions(+), 6 deletions(-)
rename {inet => nss}/ether_hton.c (98%)
rename {inet => nss}/ether_ntoh.c (98%)
diff --git a/inet/Makefile b/inet/Makefile
index bd3dc58322..4d053de748 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -43,11 +43,9 @@ routines := \
deadline \
ether_aton \
ether_aton_r \
- ether_hton \
ether_line \
ether_ntoa \
ether_ntoa_r \
- ether_ntoh \
gethstbyad \
gethstbyad_r \
gethstbynm \
diff --git a/inet/Versions b/inet/Versions
index e6d1e6f1ba..a7c1a0fb6f 100644
--- a/inet/Versions
+++ b/inet/Versions
@@ -10,8 +10,8 @@ libc {
endaliasent; endhostent; endnetent; endnetgrent; endprotoent; endservent;
# e*
- ether_aton; ether_aton_r; ether_hostton; ether_line; ether_ntoa;
- ether_ntoa_r; ether_ntohost;
+ ether_aton; ether_aton_r; ether_line; ether_ntoa;
+ ether_ntoa_r;
# g*
getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname;
diff --git a/nss/Makefile b/nss/Makefile
index 2dfa7ebef9..148c6dc1cf 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -68,6 +68,12 @@ CFLAGS-getaliasent_r.c += -fexceptions
CFLAGS-getaliasent.c += -fexceptions
endif
+# ethers routines:
+routines += \
+ ether_hton \
+ ether_ntoh \
+ # routines
+
# grp routines:
routines += \
fgetgrent \
diff --git a/nss/Versions b/nss/Versions
index 5d1b1dac3d..99208cb9df 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -10,6 +10,7 @@ libc {
endgrent;
endpwent;
endspent;
+ ether_hostton; ether_ntohost;
# f*
fgetgrent; fgetgrent_r;
diff --git a/inet/ether_hton.c b/nss/ether_hton.c
similarity index 98%
rename from inet/ether_hton.c
rename to nss/ether_hton.c
index 1b49a57f48..5419464756 100644
--- a/inet/ether_hton.c
+++ b/nss/ether_hton.c
@@ -20,7 +20,7 @@
#include <netinet/if_ether.h>
#include <string.h>
-#include "../nss/nsswitch.h"
+#include "nsswitch.h"
/* Type of the lookup function we need here. */
typedef int (*lookup_function) (const char *, struct etherent *, char *, int,
diff --git a/inet/ether_ntoh.c b/nss/ether_ntoh.c
similarity index 98%
rename from inet/ether_ntoh.c
rename to nss/ether_ntoh.c
index 9f9d7c1a63..2f1eb4ec3d 100644
--- a/inet/ether_ntoh.c
+++ b/nss/ether_ntoh.c
@@ -20,7 +20,7 @@
#include <netinet/if_ether.h>
#include <string.h>
-#include <nss/nsswitch.h>
+#include <nsswitch.h>
/* Type of the lookup function we need here. */
--
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 ` Arjun Shankar [this message]
2023-10-19 19:39 ` [PATCH 08/16] Move 'ethers' " 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 ` [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-9-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).