about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-07-17 15:19:35 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-07-17 15:19:35 +0200
commit76b8442db51a8976de19934638a42532a3af607f (patch)
tree93f96b5ca32f6c60a1613bd65c03be664c924035
parent8cde977077b3568310c743b21a905ca9ab286724 (diff)
downloadglibc-76b8442db51a8976de19934638a42532a3af607f.tar.gz
glibc-76b8442db51a8976de19934638a42532a3af607f.tar.xz
glibc-76b8442db51a8976de19934638a42532a3af607f.zip
Move <rpc/netdb.h> from sunrpc to inet
Restore <rpc/netdb.h> as an installed header. Delete the dummy header
resolv/rpc/netdb.h because inet is not an optional glibc component
(so its <rpc/netdb.h> is always available).

Fixes commit acb527929d0c2b3bb0798472c42ddb3203729708 ("Move
non-deprecated RPC-related functions from sunrpc to inet") in
combination with commit 5500cdba4018ddbda7909bc7f4f9718610b43cf0
("Remove --enable-obsolete-rpc configure flag").
-rw-r--r--include/rpc/netdb.h2
-rw-r--r--inet/Makefile3
-rw-r--r--inet/rpc/netdb.h (renamed from sunrpc/rpc/netdb.h)0
-rw-r--r--resolv/Makefile7
-rw-r--r--resolv/rpc/netdb.h3
5 files changed, 3 insertions, 12 deletions
diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h
index dc0d0e26b9..5ddd776691 100644
--- a/include/rpc/netdb.h
+++ b/include/rpc/netdb.h
@@ -1,5 +1,5 @@
 #ifndef _RPC_NETDB_H
-#include <sunrpc/rpc/netdb.h>
+#include <inet/rpc/netdb.h>
 
 # ifndef _ISOMAC
 
diff --git a/inet/Makefile b/inet/Makefile
index 1ca06bba80..7a807fe805 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -25,7 +25,8 @@ include ../Makeconfig
 headers	:= netinet/ether.h netinet/in.h netinet/in_systm.h \
 	   netinet/if_ether.h netinet/igmp.h \
 	   netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \
-	   aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h
+	   aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h \
+	   rpc/netdb.h
 
 routines := htonl htons		\
 	    inet_lnaof inet_mkadr	\
diff --git a/sunrpc/rpc/netdb.h b/inet/rpc/netdb.h
index 529a4ada21..529a4ada21 100644
--- a/sunrpc/rpc/netdb.h
+++ b/inet/rpc/netdb.h
diff --git a/resolv/Makefile b/resolv/Makefile
index f131e4b014..b61c0c3e0c 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -126,13 +126,6 @@ tests-special += $(objpfx)mtrace-tst-resolv-res_ninit.out
 endif
 endif
 
-ifeq (,$(filter sunrpc,$(subdirs)))
-# The netdb.h we install does '#include <rpc/netdb.h>', so one must exist.
-# If sunrpc/ is built in this configuration, it installs a real <rpc/netdb.h>.
-# If that's not going to happen, install our dummy file.
-headers += rpc/netdb.h
-endif
-
 generated += mtrace-tst-leaks.out tst-leaks.mtrace \
 	     mtrace-tst-leaks2.out tst-leaks2.mtrace \
 	     mtrace-tst-resolv-res_ninit.out tst-resolv-res_ninit.mtrace \
diff --git a/resolv/rpc/netdb.h b/resolv/rpc/netdb.h
deleted file mode 100644
index eecea3cb06..0000000000
--- a/resolv/rpc/netdb.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This is a dummy file for <rpc/netdb.h>, which is included by <netdb.h>.
-   This file is installed when the C library does not support the SunRPC
-   interfaces (including 'struct rpcent' et al) at all.  */