From: deraadt <deraadt@openbsd.org>
Date: Fri, 23 Oct 2015 00:52:49 +0000 (+0000)
Subject: Remove dnssocket() and dnsconnect(), since we decided to use a SOCK_DNS
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1793b882c6492420aceba3a8e1056978e6fb7024;p=openbsd

Remove dnssocket() and dnsconnect(), since we decided to use a SOCK_DNS
flag instead.
ok guenther tedu semarie
---

diff --git a/lib/libc/hidden/asr.h b/lib/libc/hidden/asr.h
index 53baf5b28d0..ccb35fddc4d 100644
--- a/lib/libc/hidden/asr.h
+++ b/lib/libc/hidden/asr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr.h,v 1.2 2015/10/18 01:45:48 deraadt Exp $	*/
+/*	$OpenBSD: asr.h,v 1.3 2015/10/23 00:52:49 deraadt Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,9 +20,6 @@
 
 #include_next <asr.h>
 
-int	dnssocket(int, int, int);
-int	dnsconnect(int, const struct sockaddr *, socklen_t);
-
 PROTO_DEPRECATED(asr_abort);
 PROTO_NORMAL(asr_run);
 PROTO_NORMAL(asr_run_sync);
@@ -38,7 +35,4 @@ PROTO_NORMAL(res_query_async);
 PROTO_NORMAL(res_search_async);
 PROTO_NORMAL(res_send_async);
 
-PROTO_NORMAL(dnssocket);
-PROTO_NORMAL(dnsconnect);
-
 #endif	/* _LIBC_ASR_H_ */
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 09b56d98efd..6a8dbaf7b3d 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.133 2015/10/19 23:13:38 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.134 2015/10/23 00:52:49 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -29,7 +29,7 @@ ASM=	__get_tcb.o __getcwd.o __semctl.o __set_tcb.o __syscall.o \
 	__thrwakeup.o accept.o accept4.o access.o acct.o adjfreq.o adjtime.o \
 	bind.o chdir.o chflags.o chflagsat.o chmod.o chown.o chroot.o \
 	clock_getres.o clock_gettime.o clock_settime.o close.o \
-	closefrom.o dnsconnect.o connect.o dup.o dup2.o dup3.o execve.o faccessat.o \
+	closefrom.o connect.o dup.o dup2.o dup3.o execve.o faccessat.o \
 	fchdir.o fchflags.o fchmod.o fchmodat.o fchown.o \
 	fchownat.o fcntl.o fhopen.o fhstat.o fhstatfs.o \
 	flock.o fpathconf.o fstat.o fstatat.o fstatfs.o \
@@ -54,7 +54,7 @@ ASM=	__get_tcb.o __getcwd.o __semctl.o __set_tcb.o __syscall.o \
 	setpgid.o setpriority.o setregid.o setresgid.o setresuid.o \
 	setreuid.o setrlimit.o setrtable.o setsid.o setsockopt.o \
 	settimeofday.o setuid.o shmat.o shmctl.o shmdt.o \
-	shmget.o shutdown.o sigaction.o sigaltstack.o dnssocket.o socket.o \
+	shmget.o shutdown.o sigaction.o sigaltstack.o socket.o \
 	socketpair.o stat.o statfs.o swapctl.o symlink.o symlinkat.o \
 	sync.o sysarch.o sysctl.o umask.o unlink.o unlinkat.o \
 	unmount.o utimensat.o utimes.o utrace.o wait4.o write.o writev.o