aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjun Shankar <arjun@redhat.com>2023-10-02 14:55:28 +0200
committerArjun Shankar <arjun@redhat.com>2023-10-24 12:31:00 +0200
commit2f1c6652d7b339526cfebc87c64c6f130cabc9ba (patch)
tree1b30ae976fad5f3cdcf49b7494b9f4955e045009
parent7f602256ab5b85db1dbfb5f40bd109c4b37b68c8 (diff)
downloadglibc-2f1c6652d7b339526cfebc87c64c6f130cabc9ba.zip
glibc-2f1c6652d7b339526cfebc87c64c6f130cabc9ba.tar.gz
glibc-2f1c6652d7b339526cfebc87c64c6f130cabc9ba.tar.bz2
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>
-rw-r--r--inet/Makefile1
-rw-r--r--nss/Makefile1
-rw-r--r--nss/Versions3
-rw-r--r--nss/getnameinfo.c (renamed from inet/getnameinfo.c)2
-rw-r--r--posix/Versions2
5 files changed, 6 insertions, 3 deletions
diff --git a/inet/Makefile b/inet/Makefile
index d275f51..b691fef 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 da5bd20..213b687 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 158a917..d765e1d 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
index 40c20b4..062652c 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 b24c7c8..0624d24 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;