From: Arjun Shankar <arjun@redhat.com>
Date: Mon, 2 Oct 2023 12:55:28 +0000 (+0200)
Subject: Move getnameinfo from 'inet' to 'nss'
X-Git-Tag: glibc-2.39~336
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f1c6652d7b339526cfebc87c64c6f130cabc9ba;p=thirdparty%2Fglibc.git

Move getnameinfo from 'inet' to 'nss'

getnameinfo is an entry points for nss functionality.  This commit moves
it from the 'inet' subdirectory to 'nss'.  The corresponding Versions
entry is also moved from 'posix' into 'nss'.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
---

diff --git a/inet/Makefile b/inet/Makefile
index d275f51b3fc..b691fef921a 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -47,7 +47,6 @@ routines := \
   ether_ntoa \
   ether_ntoa_r \
   getipv4sourcefilter \
-  getnameinfo \
   getsourcefilter \
   herrno \
   herrno-loc \
diff --git a/nss/Makefile b/nss/Makefile
index da5bd207aaf..213b68720ba 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -136,6 +136,7 @@ routines += \
   gethstbynm_r \
   gethstent \
   gethstent_r \
+  getnameinfo \
   # routines
 
 ifeq ($(have-thread-library),yes)
diff --git a/nss/Versions b/nss/Versions
index 158a9175a41..d765e1d3b6c 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -58,6 +58,9 @@ libc {
     ulckpwdf;
   }
   GLIBC_2.1 {
+    # g*
+    getnameinfo;
+
     # p*
     putgrent;
   }
diff --git a/inet/getnameinfo.c b/nss/getnameinfo.c
similarity index 99%
rename from inet/getnameinfo.c
rename to nss/getnameinfo.c
index 40c20b4be6f..062652c2297 100644
--- a/inet/getnameinfo.c
+++ b/nss/getnameinfo.c
@@ -71,7 +71,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/utsname.h>
 #include <libc-lock.h>
 #include <scratch_buffer.h>
-#include <net-internal.h>
+#include <inet/net-internal.h>
 #include <set-freeres.h>
 
 #ifndef min
diff --git a/posix/Versions b/posix/Versions
index b24c7c87ff1..0624d24bcce 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -72,7 +72,7 @@ libc {
     __pread64; __pwrite64;
 
     # g*
-    gai_strerror; getnameinfo; glob64; globfree64;
+    gai_strerror; glob64; globfree64;
 
     # p*
     pread; pread64; pwrite; pwrite64;