Merge in bind-4.9.4-P1 resolver...

1 files changed, 18 insertions, 13 deletions

diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index a1cb045..7a14855b 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -2,15 +2,17 @@
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/${MACHINE}/net ${.CURDIR}/net
+.PATH: ${.CURDIR}/../../contrib/bind/res
 
 SRCS+=	addr2ascii.c ascii2addr.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
 	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
 	getproto.c getprotoent.c getprotoname.c getservbyname.c \
 	getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \
-	inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c \
-	linkaddr.c rcmd.c recv.c res_comp.c res_data.c res_debug.c \
-	res_init.c res_mkquery.c res_query.c res_send.c send.c ether_addr.c
+	inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
+	inet_pton.c linkaddr.c map_v4v6.c nsap_addr.c \
+	rcmd.c recv.c res_comp.c res_data.c res_debug.c \
+	res_init.c res_mkquery.c res_query.c res_send.c send.c ether_addr.c \
 
 # iso_addr.c 
 # ns_addr.c ns_ntoa.c
@@ -19,9 +21,12 @@ SRCS+=	addr2ascii.c ascii2addr.c \
 .include "${.CURDIR}/${MACHINE}/net/Makefile.inc"
 
 MAN3+=	net/addr2ascii.3 \
-	net/byteorder.3 net/ethers.3 net/gethostbyname.3 net/getnetent.3 \
+	net/byteorder.3 net/ethers.3 \
 	net/getprotoent.3 net/getservent.3 net/inet.3 net/linkaddr.3 \
-	net/rcmd.3 net/resolver.3
+	net/rcmd.3
+
+# not installed from here, see usr.sbin/named/man for huge sed command:
+# => gethostbyname.3 getnetent.3 resolver.3
 
 # not installed: net/ns.3 net/iso_addr.3
 
@@ -30,11 +35,11 @@ MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
 	byteorder.3 ntohs.3
 MLINKS+=ethers.3 ether_line.3 ethers.3 ether_aton.3 ethers.3 ether_ntoa.3 \
 	ethers.3 ether_ntohost.3 ethers.3 ether_hostton.3
-MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
-	gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \
-	gethostbyname.3 herror.3
-MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
-	getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
+#MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
+#	gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \
+#	gethostbyname.3 herror.3
+#MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
+#	getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
 MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
 	getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
 MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
@@ -45,6 +50,6 @@ MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_lnaof.3 \
 MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 
 #MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
 MLINKS+=rcmd.3 rresvport.3 rcmd.3 iruserok.3 rcmd.3 ruserok.3
-MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
-	resolver.3 res_mkquery.3 resolver.3 res_send.3 resolver.3 res_query.3 \
-	resolver.3 res_search.3
+#MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
+#	resolver.3 res_mkquery.3 resolver.3 res_send.3 resolver.3 res_query.3 \
+#	resolver.3 res_search.3