From edfd25425508c64dfcc33502c12dfd61f24bfe97 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 29 Jan 2000 12:45:36 +0000 Subject: [PATCH] Regen after pointing to the real setres[ug]id(). Remove dummy function. (Note: getres[ug]id is still a dummy as it returns via pointers to a different sized integer and does need real wrappers.) --- sys/alpha/linux/linux_dummy.c | 2 -- sys/i386/linux/linux_dummy.c | 2 -- sys/i386/linux/linux_proto.h | 16 ++++------------ sys/i386/linux/linux_syscall.h | 6 +++--- sys/i386/linux/linux_sysent.c | 8 ++++---- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/alpha/linux/linux_dummy.c b/sys/alpha/linux/linux_dummy.c index 1cf14f1b1348..4124e990b6ca 100644 --- a/sys/alpha/linux/linux_dummy.c +++ b/sys/alpha/linux/linux_dummy.c @@ -88,12 +88,10 @@ DUMMY(setfsuid); DUMMY(setfsgid); DUMMY(getsid); DUMMY(sysctl); -DUMMY(setresuid); DUMMY(getresuid); DUMMY(vm86); DUMMY(query_module); DUMMY(nfsservctl); -DUMMY(setresgid); DUMMY(getresgid); DUMMY(prctl); DUMMY(rt_sigreturn); diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c index 1cf14f1b1348..4124e990b6ca 100644 --- a/sys/i386/linux/linux_dummy.c +++ b/sys/i386/linux/linux_dummy.c @@ -88,12 +88,10 @@ DUMMY(setfsuid); DUMMY(setfsgid); DUMMY(getsid); DUMMY(sysctl); -DUMMY(setresuid); DUMMY(getresuid); DUMMY(vm86); DUMMY(query_module); DUMMY(nfsservctl); -DUMMY(setresgid); DUMMY(getresgid); DUMMY(prctl); DUMMY(rt_sigreturn); diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 0d6b46d0c4dc..429377255847 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.29 2000/01/10 22:16:35 marcel Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.30 2000/01/29 12:43:29 peter Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -429,11 +429,6 @@ struct linux_mremap_args { int new_len; char new_len_[PAD_(int)]; int flags; char flags_[PAD_(int)]; }; -struct linux_setresuid_args { - linux_uid_t ruid; char ruid_[PAD_(linux_uid_t)]; - linux_uid_t euid; char euid_[PAD_(linux_uid_t)]; - linux_uid_t suid; char suid_[PAD_(linux_uid_t)]; -}; struct linux_getresuid_args { linux_uid_t * ruid; char ruid_[PAD_(linux_uid_t *)]; linux_uid_t * euid; char euid_[PAD_(linux_uid_t *)]; @@ -448,11 +443,10 @@ struct linux_query_module_args { struct linux_nfsservctl_args { register_t dummy; }; -struct linux_setresgid_args { - register_t dummy; -}; struct linux_getresgid_args { - register_t dummy; + linux_gid_t * rgid; char rgid_[PAD_(linux_gid_t *)]; + linux_gid_t * egid; char egid_[PAD_(linux_gid_t *)]; + linux_gid_t * sgid; char sgid_[PAD_(linux_gid_t *)]; }; struct linux_prctl_args { register_t dummy; @@ -652,12 +646,10 @@ int linux_sysctl __P((struct proc *, struct linux_sysctl_args *)); int linux_sched_setscheduler __P((struct proc *, struct linux_sched_setscheduler_args *)); int linux_sched_getscheduler __P((struct proc *, struct linux_sched_getscheduler_args *)); int linux_mremap __P((struct proc *, struct linux_mremap_args *)); -int linux_setresuid __P((struct proc *, struct linux_setresuid_args *)); int linux_getresuid __P((struct proc *, struct linux_getresuid_args *)); int linux_vm86 __P((struct proc *, struct linux_vm86_args *)); int linux_query_module __P((struct proc *, struct linux_query_module_args *)); int linux_nfsservctl __P((struct proc *, struct linux_nfsservctl_args *)); -int linux_setresgid __P((struct proc *, struct linux_setresgid_args *)); int linux_getresgid __P((struct proc *, struct linux_getresgid_args *)); int linux_prctl __P((struct proc *, struct linux_prctl_args *)); int linux_rt_sigreturn __P((struct proc *, struct linux_rt_sigreturn_args *)); diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h index c16f4a998816..f0505426a457 100644 --- a/sys/i386/linux/linux_syscall.h +++ b/sys/i386/linux/linux_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.29 2000/01/10 22:16:35 marcel Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.30 2000/01/29 12:43:29 peter Exp */ #define LINUX_SYS_linux_setup 0 @@ -170,13 +170,13 @@ #define LINUX_SYS_sched_rr_get_interval 161 #define LINUX_SYS_nanosleep 162 #define LINUX_SYS_linux_mremap 163 -#define LINUX_SYS_linux_setresuid 164 +#define LINUX_SYS_setresuid 164 #define LINUX_SYS_linux_getresuid 165 #define LINUX_SYS_linux_vm86 166 #define LINUX_SYS_linux_query_module 167 #define LINUX_SYS_poll 168 #define LINUX_SYS_linux_nfsservctl 169 -#define LINUX_SYS_linux_setresgid 170 +#define LINUX_SYS_setresgid 170 #define LINUX_SYS_linux_getresgid 171 #define LINUX_SYS_linux_prctl 172 #define LINUX_SYS_linux_rt_sigreturn 173 diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 9addd9c0229c..d903bdf15b32 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.29 2000/01/10 22:16:35 marcel Exp + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.30 2000/01/29 12:43:29 peter Exp */ #include "opt_compat.h" @@ -179,14 +179,14 @@ struct sysent linux_sysent[] = { { 2, (sy_call_t *)sched_rr_get_interval }, /* 161 = sched_rr_get_interval */ { 2, (sy_call_t *)nanosleep }, /* 162 = nanosleep */ { 4, (sy_call_t *)linux_mremap }, /* 163 = linux_mremap */ - { 3, (sy_call_t *)linux_setresuid }, /* 164 = linux_setresuid */ + { 3, (sy_call_t *)setresuid }, /* 164 = setresuid */ { 3, (sy_call_t *)linux_getresuid }, /* 165 = linux_getresuid */ { 0, (sy_call_t *)linux_vm86 }, /* 166 = linux_vm86 */ { 0, (sy_call_t *)linux_query_module }, /* 167 = linux_query_module */ { 3, (sy_call_t *)poll }, /* 168 = poll */ { 0, (sy_call_t *)linux_nfsservctl }, /* 169 = linux_nfsservctl */ - { 0, (sy_call_t *)linux_setresgid }, /* 170 = linux_setresgid */ - { 0, (sy_call_t *)linux_getresgid }, /* 171 = linux_getresgid */ + { 3, (sy_call_t *)setresgid }, /* 170 = setresgid */ + { 3, (sy_call_t *)linux_getresgid }, /* 171 = linux_getresgid */ { 0, (sy_call_t *)linux_prctl }, /* 172 = linux_prctl */ { 0, (sy_call_t *)linux_rt_sigreturn }, /* 173 = linux_rt_sigreturn */ { 4, (sy_call_t *)linux_rt_sigaction }, /* 174 = linux_rt_sigaction */