sync

4 files changed, 70 insertions, 19 deletions

diff --git a/sys/compat/netbsd/netbsd_syscall.h b/sys/compat/netbsd/netbsd_syscall.h
index 20deb195ab8..c6b5f9d45eb 100644
--- a/sys/compat/netbsd/netbsd_syscall.h
+++ b/sys/compat/netbsd/netbsd_syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_syscall.h,v 1.14 2001/08/26 04:14:26 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_syscall.h,v 1.15 2001/09/05 23:42:34 art Exp $	*/
 
 /*
  * System call numbers.
@@ -331,12 +331,11 @@
 /* syscall: "orecvmsg" ret: "int" args: "int" "struct omsghdr *" "int" */
 #define	NETBSD_SYS_orecvmsg	113
 
+				/* 113 is obsolete orecvmsg */
 /* syscall: "osendmsg" ret: "int" args: "int" "caddr_t" "int" */
 #define	NETBSD_SYS_osendmsg	114
 
-/* syscall: "vtrace" ret: "int" args: "int" "int" */
-#define	NETBSD_SYS_vtrace	115
-
+				/* 114 is obsolete orecvmsg */
 				/* 115 is obsolete vtrace */
 /* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
 #define	NETBSD_SYS_gettimeofday	116
@@ -366,6 +365,7 @@
 /* syscall: "orecvfrom" ret: "int" args: "int" "caddr_t" "size_t" "int" "caddr_t" "int *" */
 #define	NETBSD_SYS_orecvfrom	125
 
+				/* 125 is obsolete orecvfrom */
 /* syscall: "osetreuid" ret: "int" args: "int" "int" */
 #define	NETBSD_SYS_osetreuid	126
 
@@ -629,7 +629,7 @@
 /* syscall: "minherit" ret: "int" args: "void *" "size_t" "int" */
 #define	NETBSD_SYS_minherit	273
 
-/* syscall: "lchmod" ret: "int" args: "const char *" "mode_t" */
+/* syscall: "lchmod" ret: "int" args: "const char *" "netbsd_mode_t" */
 #define	NETBSD_SYS_lchmod	274
 
 /* syscall: "lchown" ret: "int" args: "const char *" "uid_t" "gid_t" */
@@ -683,4 +683,7 @@
 /* syscall: "__getcwd" ret: "int" args: "char *" "size_t" */
 #define	NETBSD_SYS___getcwd	296
 
-#define	NETBSD_SYS_MAXSYSCALL	298
+/* syscall: "issetugid" ret: "int" args: */
+#define	NETBSD_SYS_issetugid	305
+
+#define	NETBSD_SYS_MAXSYSCALL	306
diff --git a/sys/compat/netbsd/netbsd_syscallargs.h b/sys/compat/netbsd/netbsd_syscallargs.h
index 3828ce97569..49ec7fea64a 100644
--- a/sys/compat/netbsd/netbsd_syscallargs.h
+++ b/sys/compat/netbsd/netbsd_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_syscallargs.h,v 1.14 2001/08/26 04:14:26 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_syscallargs.h,v 1.15 2001/09/05 23:42:34 art Exp $	*/
 
 /*
  * System call argument lists.
@@ -187,7 +187,7 @@ struct netbsd_sys_getdents_args {
 
 struct netbsd_sys_lchmod_args {
 	syscallarg(const char *) path;
-	syscallarg(mode_t) mode;
+	syscallarg(netbsd_mode_t) mode;
 };
 
 struct netbsd_sys_lutimes_args {
@@ -371,10 +371,12 @@ int	compat_43_sys_sigblock	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_sigsetmask	__P((struct proc *, void *, register_t *));
 int	sys_sigsuspend	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_sigstack	__P((struct proc *, void *, register_t *));
+#ifdef MSG_COMPAT
 int	compat_43_sys_recvmsg	__P((struct proc *, void *, register_t *));
+#else
+#endif
+#ifdef MSG_COMPAT
 int	compat_43_sys_sendmsg	__P((struct proc *, void *, register_t *));
-#ifdef TRACE
-int	sys_vtrace	__P((struct proc *, void *, register_t *));
 #else
 #endif
 int	sys_gettimeofday	__P((struct proc *, void *, register_t *));
@@ -385,7 +387,10 @@ int	sys_writev	__P((struct proc *, void *, register_t *));
 int	sys_settimeofday	__P((struct proc *, void *, register_t *));
 int	sys_fchown	__P((struct proc *, void *, register_t *));
 int	sys_fchmod	__P((struct proc *, void *, register_t *));
+#ifdef MSG_COMPAT
 int	compat_43_sys_recvfrom	__P((struct proc *, void *, register_t *));
+#else
+#endif
 int	compat_43_sys_setreuid	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_setregid	__P((struct proc *, void *, register_t *));
 int	netbsd_sys_rename	__P((struct proc *, void *, register_t *));
@@ -536,3 +541,4 @@ int	netbsd_sys___sigprocmask14	__P((struct proc *, void *, register_t *));
 int	netbsd_sys___sigsuspend14	__P((struct proc *, void *, register_t *));
 int	netbsd_sys___sigreturn14	__P((struct proc *, void *, register_t *));
 int	netbsd_sys___getcwd	__P((struct proc *, void *, register_t *));
+int	sys_issetugid	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/netbsd/netbsd_syscalls.c b/sys/compat/netbsd/netbsd_syscalls.c
index ce7f4d5565a..df6152307d0 100644
--- a/sys/compat/netbsd/netbsd_syscalls.c
+++ b/sys/compat/netbsd/netbsd_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_syscalls.c,v 1.14 2001/08/26 04:14:26 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_syscalls.c,v 1.15 2001/09/05 23:42:34 art Exp $	*/
 
 /*
  * System call names.
@@ -125,13 +125,17 @@ char *netbsd_syscallnames[] = {
 	"osigsetmask",			/* 110 = osigsetmask */
 	"sigsuspend",			/* 111 = sigsuspend */
 	"osigstack",			/* 112 = osigstack */
+#ifdef MSG_COMPAT
 	"orecvmsg",			/* 113 = orecvmsg */
+#else
+	"#113 (obsolete orecvmsg)",		/* 113 = obsolete orecvmsg */
+#endif
+#ifdef MSG_COMPAT
 	"osendmsg",			/* 114 = osendmsg */
-#ifdef TRACE
-	"vtrace",			/* 115 = vtrace */
 #else
-	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
+	"#114 (obsolete orecvmsg)",		/* 114 = obsolete orecvmsg */
 #endif
+	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
 	"gettimeofday",			/* 116 = gettimeofday */
 	"getrusage",			/* 117 = getrusage */
 	"getsockopt",			/* 118 = getsockopt */
@@ -141,7 +145,11 @@ char *netbsd_syscallnames[] = {
 	"settimeofday",			/* 122 = settimeofday */
 	"fchown",			/* 123 = fchown */
 	"fchmod",			/* 124 = fchmod */
+#ifdef MSG_COMPAT
 	"orecvfrom",			/* 125 = orecvfrom */
+#else
+	"#125 (obsolete orecvfrom)",		/* 125 = obsolete orecvfrom */
+#endif
 	"osetreuid",			/* 126 = osetreuid */
 	"osetregid",			/* 127 = osetregid */
 	"rename",			/* 128 = rename */
@@ -384,4 +392,12 @@ char *netbsd_syscallnames[] = {
 	"__sigreturn14",			/* 295 = __sigreturn14 */
 	"__getcwd",			/* 296 = __getcwd */
 	"#297 (unimplemented)",		/* 297 = unimplemented */
+	"#298 (unimplemented)",		/* 298 = unimplemented */
+	"#299 (unimplemented)",		/* 299 = unimplemented */
+	"#300 (unimplemented)",		/* 300 = unimplemented */
+	"#301 (unimplemented)",		/* 301 = unimplemented */
+	"#302 (unimplemented)",		/* 302 = unimplemented */
+	"#303 (unimplemented)",		/* 303 = unimplemented */
+	"#304 (unimplemented)",		/* 304 = unimplemented */
+	"issetugid",			/* 305 = issetugid */
 };
diff --git a/sys/compat/netbsd/netbsd_sysent.c b/sys/compat/netbsd/netbsd_sysent.c
index a9d528865cf..b222e8a0097 100644
--- a/sys/compat/netbsd/netbsd_sysent.c
+++ b/sys/compat/netbsd/netbsd_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_sysent.c,v 1.14 2001/08/26 04:14:26 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_sysent.c,v 1.15 2001/09/05 23:42:34 art Exp $	*/
 
 /*
  * System call switch table.
@@ -253,17 +253,22 @@ struct sysent netbsd_sysent[] = {
 	    sys_sigsuspend },			/* 111 = sigsuspend */
 	{ 2, s(struct compat_43_sys_sigstack_args),
 	    compat_43_sys_sigstack },		/* 112 = osigstack */
+#ifdef MSG_COMPAT
 	{ 3, s(struct compat_43_sys_recvmsg_args),
 	    compat_43_sys_recvmsg },		/* 113 = orecvmsg */
+#else
+	{ 0, 0,
+	    sys_nosys },			/* 113 = obsolete orecvmsg */
+#endif
+#ifdef MSG_COMPAT
 	{ 3, s(struct compat_43_sys_sendmsg_args),
 	    compat_43_sys_sendmsg },		/* 114 = osendmsg */
-#ifdef TRACE
-	{ 2, s(struct sys_vtrace_args),
-	    sys_vtrace },			/* 115 = vtrace */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 115 = obsolete vtrace */
+	    sys_nosys },			/* 114 = obsolete orecvmsg */
 #endif
+	{ 0, 0,
+	    sys_nosys },			/* 115 = obsolete vtrace */
 	{ 2, s(struct sys_gettimeofday_args),
 	    sys_gettimeofday },			/* 116 = gettimeofday */
 	{ 2, s(struct sys_getrusage_args),
@@ -282,8 +287,13 @@ struct sysent netbsd_sysent[] = {
 	    sys_fchown },			/* 123 = fchown */
 	{ 2, s(struct sys_fchmod_args),
 	    sys_fchmod },			/* 124 = fchmod */
+#ifdef MSG_COMPAT
 	{ 6, s(struct compat_43_sys_recvfrom_args),
 	    compat_43_sys_recvfrom },		/* 125 = orecvfrom */
+#else
+	{ 0, 0,
+	    sys_nosys },			/* 125 = obsolete orecvfrom */
+#endif
 	{ 2, s(struct compat_43_sys_setreuid_args),
 	    compat_43_sys_setreuid },		/* 126 = osetreuid */
 	{ 2, s(struct compat_43_sys_setregid_args),
@@ -732,5 +742,21 @@ struct sysent netbsd_sysent[] = {
 	    netbsd_sys___getcwd },		/* 296 = __getcwd */
 	{ 0, 0,
 	    sys_nosys },			/* 297 = unimplemented */
+	{ 0, 0,
+	    sys_nosys },			/* 298 = unimplemented */
+	{ 0, 0,
+	    sys_nosys },			/* 299 = unimplemented */
+	{ 0, 0,
+	    sys_nosys },			/* 300 = unimplemented */
+	{ 0, 0,
+	    sys_nosys },			/* 301 = unimplemented */
+	{ 0, 0,
+	    sys_nosys },			/* 302 = unimplemented */
+	{ 0, 0,
+	    sys_nosys },			/* 303 = unimplemented */
+	{ 0, 0,
+	    sys_nosys },			/* 304 = unimplemented */
+	{ 0, 0,
+	    sys_issetugid },			/* 305 = issetugid */
 };