Now that we have [gs]etres[ug]id() as a native system call, use it

for HP-UX, FreeBSD, and Linux emulations.  Note that Linux has two
versions of these system calls.  One for 16bit uids and another for
32bit uids.

2 files changed, 6 insertions, 29 deletions

diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c
index ac19d041061..cb30435c0d2 100644
--- a/sys/compat/hpux/hpux_compat.c
+++ b/sys/compat/hpux/hpux_compat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hpux_compat.c,v 1.20 2002/08/02 18:06:25 millert Exp $	*/
+/*	$OpenBSD: hpux_compat.c,v 1.21 2002/10/30 20:10:48 millert Exp $	*/
 /*	$NetBSD: hpux_compat.c,v 1.35 1997/05/08 16:19:48 mycroft Exp $	*/
 
 /*
@@ -996,31 +996,6 @@ hpux_sys_setpgrp2(p, v, retval)
 	return (sys_setpgid(p, uap, retval));
 }
 
-/*
- * XXX Same as BSD setre[ug]id right now.  Need to consider saved ids.
- */
-int
-hpux_sys_setresuid(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	struct hpux_sys_setresuid_args *uap = v;
-
-	return (compat_43_sys_setreuid(p, uap, retval));
-}
-
-int
-hpux_sys_setresgid(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	struct hpux_sys_setresgid_args *uap = v;
-
-	return (compat_43_sys_setregid(p, uap, retval));
-}
-
 int
 hpux_sys_getrlimit(p, v, retval)
 	struct proc *p;
diff --git a/sys/compat/hpux/syscalls.master b/sys/compat/hpux/syscalls.master
index 89c44c345b9..7ee748ea294 100644
--- a/sys/compat/hpux/syscalls.master
+++ b/sys/compat/hpux/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.8 2002/03/14 00:42:25 miod Exp $
+	$OpenBSD: syscalls.master,v 1.9 2002/10/30 20:10:48 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.13 1997/03/16 03:48:04 thorpej Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -195,8 +195,10 @@
 123	NOARGS		{ int sys_fchown(int fd, int uid, int gid); }
 124	NOARGS		{ int sys_fchmod(int fd, int mode); }
 125	UNIMPL
-126	STD		{ int hpux_sys_setresuid(uid_t r, uid_t e, uid_t s); }
-127	STD		{ int hpux_sys_setresgid(gid_t r, gid_t e, gid_t s); }
+126	NOARGS		{ int sys_setresuid(uid_t ruid, uid_t uide, \
+			    uid_t suid); }
+127	NOARGS		{ int sys_setresgid(gid_t rgid, gid_t egid, \
+			    gid_t sgid); }
 128	STD		{ int hpux_sys_rename(char *from, char *to); }
 129	STD		{ int hpux_sys_truncate(char *path, long length); }
 130	NOARGS		{ int compat_43_sys_ftruncate(int fd, long length); }