diff options
-rw-r--r-- | sys/compat/freebsd/freebsd_syscall.h | 10 | ||||
-rw-r--r-- | sys/compat/freebsd/freebsd_syscallargs.h | 6 | ||||
-rw-r--r-- | sys/compat/freebsd/freebsd_syscalls.c | 8 | ||||
-rw-r--r-- | sys/compat/freebsd/freebsd_sysent.c | 12 | ||||
-rw-r--r-- | sys/compat/hpux/hpux_syscall.h | 4 | ||||
-rw-r--r-- | sys/compat/hpux/hpux_syscallargs.h | 20 | ||||
-rw-r--r-- | sys/compat/hpux/hpux_syscalls.c | 4 | ||||
-rw-r--r-- | sys/compat/hpux/hpux_sysent.c | 12 | ||||
-rw-r--r-- | sys/compat/linux/linux_syscall.h | 20 | ||||
-rw-r--r-- | sys/compat/linux/linux_syscallargs.h | 44 | ||||
-rw-r--r-- | sys/compat/linux/linux_syscalls.c | 6 | ||||
-rw-r--r-- | sys/compat/linux/linux_sysent.c | 24 |
12 files changed, 83 insertions, 87 deletions
diff --git a/sys/compat/freebsd/freebsd_syscall.h b/sys/compat/freebsd/freebsd_syscall.h index c957dd7ad09..2e5200aba38 100644 --- a/sys/compat/freebsd/freebsd_syscall.h +++ b/sys/compat/freebsd/freebsd_syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: freebsd_syscall.h,v 1.19 2002/07/06 19:22:43 nordin Exp $ */ +/* $OpenBSD: freebsd_syscall.h,v 1.20 2002/10/30 20:11:28 millert Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.18 2002/07/06 19:14:20 nordin Exp + * created from OpenBSD: syscalls.master,v 1.19 2002/10/30 20:10:48 millert Exp */ /* syscall: "syscall" ret: "int" args: */ @@ -611,6 +611,12 @@ /* syscall: "lchown" ret: "int" args: "char *" "int" "int" */ #define FREEBSD_SYS_lchown 254 +/* syscall: "setresuid" ret: "int" args: "uid_t" "uid_t" "uid_t" */ +#define FREEBSD_SYS_setresuid 311 + +/* syscall: "setresgid" ret: "int" args: "gid_t" "gid_t" "gid_t" */ +#define FREEBSD_SYS_setresgid 312 + /* syscall: "sigprocmask40" ret: "int" args: "int" "const freebsd_sigset_t *" "freebsd_sigset_t *" */ #define FREEBSD_SYS_sigprocmask40 340 diff --git a/sys/compat/freebsd/freebsd_syscallargs.h b/sys/compat/freebsd/freebsd_syscallargs.h index 39240b8baf7..616435cb3f0 100644 --- a/sys/compat/freebsd/freebsd_syscallargs.h +++ b/sys/compat/freebsd/freebsd_syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: freebsd_syscallargs.h,v 1.21 2002/07/06 19:22:43 nordin Exp $ */ +/* $OpenBSD: freebsd_syscallargs.h,v 1.22 2002/10/30 20:11:28 millert Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.18 2002/07/06 19:14:20 nordin Exp + * created from OpenBSD: syscalls.master,v 1.19 2002/10/30 20:10:48 millert Exp */ #ifdef syscallarg @@ -493,6 +493,8 @@ int sys_rfork(struct proc *, void *, register_t *); int freebsd_sys_poll2(struct proc *, void *, register_t *); int sys_issetugid(struct proc *, void *, register_t *); int sys_lchown(struct proc *, void *, register_t *); +int sys_setresuid(struct proc *, void *, register_t *); +int sys_setresgid(struct proc *, void *, register_t *); int freebsd_sys_sigprocmask40(struct proc *, void *, register_t *); int freebsd_sys_sigsuspend40(struct proc *, void *, register_t *); int freebsd_sys_sigaction40(struct proc *, void *, register_t *); diff --git a/sys/compat/freebsd/freebsd_syscalls.c b/sys/compat/freebsd/freebsd_syscalls.c index 8f8750cd2fe..207ff44c12f 100644 --- a/sys/compat/freebsd/freebsd_syscalls.c +++ b/sys/compat/freebsd/freebsd_syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: freebsd_syscalls.c,v 1.19 2002/07/06 19:22:43 nordin Exp $ */ +/* $OpenBSD: freebsd_syscalls.c,v 1.20 2002/10/30 20:11:28 millert Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.18 2002/07/06 19:14:20 nordin Exp + * created from OpenBSD: syscalls.master,v 1.19 2002/10/30 20:10:48 millert Exp */ char *freebsd_syscallnames[] = { @@ -383,8 +383,8 @@ char *freebsd_syscallnames[] = { "#308 (unimplemented kldstat)", /* 308 = unimplemented kldstat */ "#309 (unimplemented kldfirstmod)", /* 309 = unimplemented kldfirstmod */ "#310 (unimplemented getsid)", /* 310 = unimplemented getsid */ - "#311 (unimplemented setresuid)", /* 311 = unimplemented setresuid */ - "#312 (unimplemented setresgid)", /* 312 = unimplemented setresgid */ + "setresuid", /* 311 = setresuid */ + "setresgid", /* 312 = setresgid */ "#313 (unimplemented signanosleep)", /* 313 = unimplemented signanosleep */ "#314 (unimplemented aio_return)", /* 314 = unimplemented aio_return */ "#315 (unimplemented aio_suspend)", /* 315 = unimplemented aio_suspend */ diff --git a/sys/compat/freebsd/freebsd_sysent.c b/sys/compat/freebsd/freebsd_sysent.c index 59353fefe65..5944082922b 100644 --- a/sys/compat/freebsd/freebsd_sysent.c +++ b/sys/compat/freebsd/freebsd_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: freebsd_sysent.c,v 1.20 2002/07/06 19:22:43 nordin Exp $ */ +/* $OpenBSD: freebsd_sysent.c,v 1.21 2002/10/30 20:11:28 millert Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.18 2002/07/06 19:14:20 nordin Exp + * created from OpenBSD: syscalls.master,v 1.19 2002/10/30 20:10:48 millert Exp */ #include <sys/param.h> @@ -730,10 +730,10 @@ struct sysent freebsd_sysent[] = { sys_nosys }, /* 309 = unimplemented kldfirstmod */ { 0, 0, sys_nosys }, /* 310 = unimplemented getsid */ - { 0, 0, - sys_nosys }, /* 311 = unimplemented setresuid */ - { 0, 0, - sys_nosys }, /* 312 = unimplemented setresgid */ + { 3, s(struct sys_setresuid_args), + sys_setresuid }, /* 311 = setresuid */ + { 3, s(struct sys_setresgid_args), + sys_setresgid }, /* 312 = setresgid */ { 0, 0, sys_nosys }, /* 313 = unimplemented signanosleep */ { 0, 0, diff --git a/sys/compat/hpux/hpux_syscall.h b/sys/compat/hpux/hpux_syscall.h index 8164d5d810b..7f66f5266d3 100644 --- a/sys/compat/hpux/hpux_syscall.h +++ b/sys/compat/hpux/hpux_syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: hpux_syscall.h,v 1.9 2002/03/14 00:44:20 miod Exp $ */ +/* $OpenBSD: hpux_syscall.h,v 1.10 2002/10/30 20:11:28 millert Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.8 2002/03/14 00:42:25 miod Exp + * created from OpenBSD: syscalls.master,v 1.9 2002/10/30 20:10:48 millert Exp */ /* syscall: "syscall" ret: "int" args: */ diff --git a/sys/compat/hpux/hpux_syscallargs.h b/sys/compat/hpux/hpux_syscallargs.h index 9ca7331ec3d..b53eb3d49fb 100644 --- a/sys/compat/hpux/hpux_syscallargs.h +++ b/sys/compat/hpux/hpux_syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: hpux_syscallargs.h,v 1.11 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: hpux_syscallargs.h,v 1.12 2002/10/30 20:11:28 millert Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.8 2002/03/14 00:42:25 miod Exp + * created from OpenBSD: syscalls.master,v 1.9 2002/10/30 20:10:48 millert Exp */ #ifdef syscallarg @@ -264,18 +264,6 @@ struct hpux_sys_writev_args { syscallarg(u_int) iovcnt; }; -struct hpux_sys_setresuid_args { - syscallarg(uid_t) r; - syscallarg(uid_t) e; - syscallarg(uid_t) s; -}; - -struct hpux_sys_setresgid_args { - syscallarg(gid_t) r; - syscallarg(gid_t) e; - syscallarg(gid_t) s; -}; - struct hpux_sys_rename_args { syscallarg(char *) from; syscallarg(char *) to; @@ -481,8 +469,8 @@ int hpux_sys_writev(struct proc *, void *, register_t *); int sys_settimeofday(struct proc *, void *, register_t *); int sys_fchown(struct proc *, void *, register_t *); int sys_fchmod(struct proc *, void *, register_t *); -int hpux_sys_setresuid(struct proc *, void *, register_t *); -int hpux_sys_setresgid(struct proc *, void *, register_t *); +int sys_setresuid(struct proc *, void *, register_t *); +int sys_setresgid(struct proc *, void *, register_t *); int hpux_sys_rename(struct proc *, void *, register_t *); int hpux_sys_truncate(struct proc *, void *, register_t *); int compat_43_sys_ftruncate(struct proc *, void *, register_t *); diff --git a/sys/compat/hpux/hpux_syscalls.c b/sys/compat/hpux/hpux_syscalls.c index dec29d52ee0..7e508527de8 100644 --- a/sys/compat/hpux/hpux_syscalls.c +++ b/sys/compat/hpux/hpux_syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: hpux_syscalls.c,v 1.9 2002/03/14 00:44:20 miod Exp $ */ +/* $OpenBSD: hpux_syscalls.c,v 1.10 2002/10/30 20:11:28 millert Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.8 2002/03/14 00:42:25 miod Exp + * created from OpenBSD: syscalls.master,v 1.9 2002/10/30 20:10:48 millert Exp */ char *hpux_syscallnames[] = { diff --git a/sys/compat/hpux/hpux_sysent.c b/sys/compat/hpux/hpux_sysent.c index d756f387d3d..2f272552b37 100644 --- a/sys/compat/hpux/hpux_sysent.c +++ b/sys/compat/hpux/hpux_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: hpux_sysent.c,v 1.10 2002/03/14 00:44:20 miod Exp $ */ +/* $OpenBSD: hpux_sysent.c,v 1.11 2002/10/30 20:11:28 millert Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.8 2002/03/14 00:42:25 miod Exp + * created from OpenBSD: syscalls.master,v 1.9 2002/10/30 20:10:48 millert Exp */ #include <sys/param.h> @@ -277,10 +277,10 @@ struct sysent hpux_sysent[] = { sys_fchmod }, /* 124 = fchmod */ { 0, 0, sys_nosys }, /* 125 = unimplemented */ - { 3, s(struct hpux_sys_setresuid_args), - hpux_sys_setresuid }, /* 126 = setresuid */ - { 3, s(struct hpux_sys_setresgid_args), - hpux_sys_setresgid }, /* 127 = setresgid */ + { 3, s(struct sys_setresuid_args), + sys_setresuid }, /* 126 = setresuid */ + { 3, s(struct sys_setresgid_args), + sys_setresgid }, /* 127 = setresgid */ { 2, s(struct hpux_sys_rename_args), hpux_sys_rename }, /* 128 = rename */ { 2, s(struct hpux_sys_truncate_args), diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h index fa2805a5755..1a1bc48568e 100644 --- a/sys/compat/linux/linux_syscall.h +++ b/sys/compat/linux/linux_syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: linux_syscall.h,v 1.36 2002/10/28 03:39:30 fgsch Exp $ */ +/* $OpenBSD: linux_syscall.h,v 1.37 2002/10/30 20:11:27 millert Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.35 2002/10/28 03:35:53 fgsch Exp + * created from OpenBSD: syscalls.master,v 1.36 2002/10/30 20:10:48 millert Exp */ /* syscall: "syscall" ret: "int" args: */ @@ -508,11 +508,11 @@ /* syscall: "mremap" ret: "int" args: "void *" "size_t" "size_t" "long" */ #define LINUX_SYS_mremap 163 -/* syscall: "setresuid16" ret: "int" args: "uid_t" "uid_t" "uid_t" */ +/* syscall: "setresuid16" ret: "int" args: "u_int16_t" "u_int16_t" "u_int16_t" */ #define LINUX_SYS_setresuid16 164 -/* syscall: "linux_getresuid16" ret: "int" args: "uid_t *" "uid_t *" "uid_t *" */ -#define LINUX_SYS_linux_getresuid16 165 +/* syscall: "getresuid16" ret: "int" args: "u_int16_t *" "u_int16_t *" "u_int16_t *" */ +#define LINUX_SYS_getresuid16 165 /* syscall: "vm86" ret: "int" args: */ #define LINUX_SYS_vm86 166 @@ -526,10 +526,10 @@ /* syscall: "nfsservctl" ret: "int" args: */ #define LINUX_SYS_nfsservctl 169 -/* syscall: "setresgid16" ret: "int" args: "gid_t" "gid_t" "gid_t" */ +/* syscall: "setresgid16" ret: "int" args: "u_int16_t" "u_int16_t" "u_int16_t" */ #define LINUX_SYS_setresgid16 170 -/* syscall: "getresgid16" ret: "int" args: "gid_t *" "gid_t *" "gid_t *" */ +/* syscall: "getresgid16" ret: "int" args: "u_int16_t *" "u_int16_t *" "u_int16_t *" */ #define LINUX_SYS_getresgid16 171 /* syscall: "prctl" ret: "int" args: */ @@ -640,16 +640,16 @@ /* syscall: "fchown" ret: "int" args: */ #define LINUX_SYS_fchown 207 -/* syscall: "setresuid" ret: "int" args: */ +/* syscall: "setresuid" ret: "int" args: "uid_t" "uid_t" "uid_t" */ #define LINUX_SYS_setresuid 208 /* syscall: "getresuid" ret: "int" args: "uid_t *" "uid_t *" "uid_t *" */ #define LINUX_SYS_getresuid 209 -/* syscall: "setresgid" ret: "int" args: */ +/* syscall: "setresgid" ret: "int" args: "gid_t" "gid_t" "gid_t" */ #define LINUX_SYS_setresgid 210 -/* syscall: "getresgid" ret: "int" args: */ +/* syscall: "getresgid" ret: "int" args: "gid_t *" "gid_t *" "gid_t *" */ #define LINUX_SYS_getresgid 211 /* syscall: "chown" ret: "int" args: */ diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h index 67fbd53602e..895f7037af3 100644 --- a/sys/compat/linux/linux_syscallargs.h +++ b/sys/compat/linux/linux_syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: linux_syscallargs.h,v 1.38 2002/10/28 03:39:30 fgsch Exp $ */ +/* $OpenBSD: linux_syscallargs.h,v 1.39 2002/10/30 20:11:27 millert Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.35 2002/10/28 03:35:53 fgsch Exp + * created from OpenBSD: syscalls.master,v 1.36 2002/10/30 20:10:48 millert Exp */ #ifdef syscallarg @@ -407,21 +407,27 @@ struct linux_sys_mremap_args { }; struct linux_sys_setresuid16_args { - syscallarg(uid_t) ruid; - syscallarg(uid_t) euid; - syscallarg(uid_t) suid; + syscallarg(u_int16_t) ruid; + syscallarg(u_int16_t) euid; + syscallarg(u_int16_t) suid; +}; + +struct linux_sys_getresuid16_args { + syscallarg(u_int16_t *) ruid; + syscallarg(u_int16_t *) euid; + syscallarg(u_int16_t *) suid; }; struct linux_sys_setresgid16_args { - syscallarg(gid_t) rgid; - syscallarg(gid_t) egid; - syscallarg(gid_t) sgid; + syscallarg(u_int16_t) rgid; + syscallarg(u_int16_t) egid; + syscallarg(u_int16_t) sgid; }; struct linux_sys_getresgid16_args { - syscallarg(gid_t *) rgid; - syscallarg(gid_t *) egid; - syscallarg(gid_t *) sgid; + syscallarg(u_int16_t *) rgid; + syscallarg(u_int16_t *) egid; + syscallarg(u_int16_t *) sgid; }; struct linux_sys_rt_sigreturn_args { @@ -507,12 +513,6 @@ struct linux_sys_fstat64_args { syscallarg(struct linux_stat64 *) sp; }; -struct linux_sys_getresuid_args { - syscallarg(uid_t *) ruid; - syscallarg(uid_t *) euid; - syscallarg(uid_t *) suid; -}; - struct linux_sys_setfsuid_args { syscallarg(uid_t) uid; }; @@ -713,7 +713,7 @@ int linux_sys_sched_rr_get_interval(struct proc *, void *, register_t *); int sys_nanosleep(struct proc *, void *, register_t *); int linux_sys_mremap(struct proc *, void *, register_t *); int linux_sys_setresuid16(struct proc *, void *, register_t *); -int linux_sys_getresuid(struct proc *, void *, register_t *); +int linux_sys_getresuid16(struct proc *, void *, register_t *); int linux_sys_vm86(struct proc *, void *, register_t *); int linux_sys_query_module(struct proc *, void *, register_t *); int sys_poll(struct proc *, void *, register_t *); @@ -756,10 +756,10 @@ int linux_sys_setregid(struct proc *, void *, register_t *); int sys_getgroups(struct proc *, void *, register_t *); int sys_setgroups(struct proc *, void *, register_t *); int linux_sys_fchown(struct proc *, void *, register_t *); -int linux_sys_setresuid(struct proc *, void *, register_t *); -int linux_sys_getresuid(struct proc *, void *, register_t *); -int linux_sys_setresgid(struct proc *, void *, register_t *); -int linux_sys_getresgid(struct proc *, void *, register_t *); +int sys_setresuid(struct proc *, void *, register_t *); +int sys_getresuid(struct proc *, void *, register_t *); +int sys_setresgid(struct proc *, void *, register_t *); +int sys_getresgid(struct proc *, void *, register_t *); int linux_sys_chown(struct proc *, void *, register_t *); int sys_setuid(struct proc *, void *, register_t *); int sys_setgid(struct proc *, void *, register_t *); diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c index 4c3143de7c5..eba6c0f006e 100644 --- a/sys/compat/linux/linux_syscalls.c +++ b/sys/compat/linux/linux_syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: linux_syscalls.c,v 1.36 2002/10/28 03:39:30 fgsch Exp $ */ +/* $OpenBSD: linux_syscalls.c,v 1.37 2002/10/30 20:11:27 millert Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.35 2002/10/28 03:35:53 fgsch Exp + * created from OpenBSD: syscalls.master,v 1.36 2002/10/30 20:10:48 millert Exp */ char *linux_syscallnames[] = { @@ -189,7 +189,7 @@ char *linux_syscallnames[] = { "nanosleep", /* 162 = nanosleep */ "mremap", /* 163 = mremap */ "setresuid16", /* 164 = setresuid16 */ - "linux_getresuid16", /* 165 = linux_getresuid16 */ + "getresuid16", /* 165 = getresuid16 */ "vm86", /* 166 = vm86 */ "query_module", /* 167 = query_module */ "poll", /* 168 = poll */ diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c index ecc28670251..270aaa1b591 100644 --- a/sys/compat/linux/linux_sysent.c +++ b/sys/compat/linux/linux_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: linux_sysent.c,v 1.37 2002/10/28 03:39:30 fgsch Exp $ */ +/* $OpenBSD: linux_sysent.c,v 1.38 2002/10/30 20:11:27 millert Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from OpenBSD: syscalls.master,v 1.35 2002/10/28 03:35:53 fgsch Exp + * created from OpenBSD: syscalls.master,v 1.36 2002/10/30 20:10:48 millert Exp */ #include <sys/param.h> @@ -370,8 +370,8 @@ struct sysent linux_sysent[] = { linux_sys_mremap }, /* 163 = mremap */ { 3, s(struct linux_sys_setresuid16_args), linux_sys_setresuid16 }, /* 164 = setresuid16 */ - { 3, s(struct linux_sys_getresuid_args), - linux_sys_getresuid }, /* 165 = linux_getresuid16 */ + { 3, s(struct linux_sys_getresuid16_args), + linux_sys_getresuid16 }, /* 165 = getresuid16 */ { 0, 0, linux_sys_vm86 }, /* 166 = vm86 */ { 0, 0, @@ -456,14 +456,14 @@ struct sysent linux_sysent[] = { sys_setgroups }, /* 206 = setgroups */ { 0, 0, linux_sys_fchown }, /* 207 = fchown */ - { 0, 0, - linux_sys_setresuid }, /* 208 = setresuid */ - { 3, s(struct linux_sys_getresuid_args), - linux_sys_getresuid }, /* 209 = getresuid */ - { 0, 0, - linux_sys_setresgid }, /* 210 = setresgid */ - { 0, 0, - linux_sys_getresgid }, /* 211 = getresgid */ + { 3, s(struct sys_setresuid_args), + sys_setresuid }, /* 208 = setresuid */ + { 3, s(struct sys_getresuid_args), + sys_getresuid }, /* 209 = getresuid */ + { 3, s(struct sys_setresgid_args), + sys_setresgid }, /* 210 = setresgid */ + { 3, s(struct sys_getresgid_args), + sys_getresgid }, /* 211 = getresgid */ { 0, 0, linux_sys_chown }, /* 212 = chown */ { 1, s(struct sys_setuid_args), |