From: deraadt <deraadt@openbsd.org>
Date: Sun, 18 Oct 2015 00:05:59 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=466baefc71bde6fa008d52e2ab649e258cd330ff;p=openbsd

sync
---

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index a0c662cc65e..52a8a3d750f 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.175 2015/10/09 01:11:12 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.176 2015/10/18 00:05:59 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.162 2015/10/09 01:10:27 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.163 2015/10/18 00:04:43 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -355,10 +355,10 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 157 = obsolete statfs25 */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 158 = obsolete fstatfs25 */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 159 = unimplemented */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 160 = unimplemented */
+	{ 3, s(struct sys_dnsconnect_args), 0,
+	    sys_dnsconnect },			/* 159 = dnsconnect */
+	{ 3, s(struct sys_dnssocket_args), 0,
+	    sys_dnssocket },			/* 160 = dnssocket */
 	{ 2, s(struct sys_getfh_args), 0,
 	    sys_getfh },			/* 161 = getfh */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 0d63c5dd6c8..b6833b08178 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.174 2015/10/09 01:11:12 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.175 2015/10/18 00:05:59 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.162 2015/10/09 01:10:27 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.163 2015/10/18 00:04:43 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -183,8 +183,8 @@ char *syscallnames[] = {
 	"#156 (obsolete ogetdirentries)",		/* 156 = obsolete ogetdirentries */
 	"#157 (obsolete statfs25)",		/* 157 = obsolete statfs25 */
 	"#158 (obsolete fstatfs25)",		/* 158 = obsolete fstatfs25 */
-	"#159 (unimplemented)",		/* 159 = unimplemented */
-	"#160 (unimplemented)",		/* 160 = unimplemented */
+	"dnsconnect",			/* 159 = dnsconnect */
+	"dnssocket",			/* 160 = dnssocket */
 	"getfh",			/* 161 = getfh */
 	"#162 (obsolete ogetdomainname)",		/* 162 = obsolete ogetdomainname */
 	"#163 (obsolete osetdomainname)",		/* 163 = obsolete osetdomainname */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 1d3ad6e281e..f86d104993a 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.173 2015/10/09 01:11:12 deraadt Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.174 2015/10/18 00:05:59 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.162 2015/10/09 01:10:27 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.163 2015/10/18 00:04:43 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -424,6 +424,12 @@
 				/* 156 is obsolete ogetdirentries */
 				/* 157 is obsolete statfs25 */
 				/* 158 is obsolete fstatfs25 */
+/* syscall: "dnsconnect" ret: "int" args: "int" "const struct sockaddr *" "socklen_t" */
+#define	SYS_dnsconnect	159
+
+/* syscall: "dnssocket" ret: "int" args: "int" "int" "int" */
+#define	SYS_dnssocket	160
+
 /* syscall: "getfh" ret: "int" args: "const char *" "fhandle_t *" */
 #define	SYS_getfh	161
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 8585fe05876..3cfad4fed34 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.176 2015/10/09 01:11:12 deraadt Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.177 2015/10/18 00:05:59 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.162 2015/10/09 01:10:27 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.163 2015/10/18 00:04:43 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -672,6 +672,18 @@ struct sys_nfssvc_args {
 	syscallarg(void *) argp;
 };
 
+struct sys_dnsconnect_args {
+	syscallarg(int) s;
+	syscallarg(const struct sockaddr *) name;
+	syscallarg(socklen_t) namelen;
+};
+
+struct sys_dnssocket_args {
+	syscallarg(int) domain;
+	syscallarg(int) type;
+	syscallarg(int) protocol;
+};
+
 struct sys_getfh_args {
 	syscallarg(const char *) fname;
 	syscallarg(fhandle_t *) fhp;
@@ -1227,6 +1239,8 @@ int	sys_quotactl(struct proc *, void *, register_t *);
 int	sys_nfssvc(struct proc *, void *, register_t *);
 #else
 #endif
+int	sys_dnsconnect(struct proc *, void *, register_t *);
+int	sys_dnssocket(struct proc *, void *, register_t *);
 int	sys_getfh(struct proc *, void *, register_t *);
 int	sys_sysarch(struct proc *, void *, register_t *);
 int	sys_pread(struct proc *, void *, register_t *);