From eae59a5681a6725d38f210acbd9ca82ba170c79c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 8 Jun 2003 22:37:53 +0000 Subject: Update. * sysdeps/unix/sysv/linux/seteuid.c (seteuid): Use setresuid32 syscall directly if possible. If __ASSUME_SETRESUID_SYSCALL is defined drop compatibility code. * sysdeps/unix/sysv/linux/setegid.c (setegid): Use setresgid32 syscall directly if possible. If __ASSUME_SETRESUID_SYSCALL is defined drop compatibility code. * sysdeps/unix/sysv/linux/i386/seteuid.c (seteuid): Use setresuid32 syscall directly if possible. * sysdeps/unix/sysv/linux/i386/setegid.c (setegid): Use setresgid32 syscall directly if possible. --- sysdeps/unix/sysv/linux/i386/seteuid.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'sysdeps/unix/sysv/linux/i386/seteuid.c') diff --git a/sysdeps/unix/sysv/linux/i386/seteuid.c b/sysdeps/unix/sysv/linux/i386/seteuid.c index ba0b86d3..87e348a 100644 --- a/sysdeps/unix/sysv/linux/i386/seteuid.c +++ b/sysdeps/unix/sysv/linux/i386/seteuid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,10 +17,12 @@ 02111-1307 USA. */ #include -#include #include #include +#include +#include "kernel-features.h" + #ifdef __NR_setresuid extern int __setresuid (uid_t ruid, uid_t euid, uid_t suid); @@ -29,21 +31,25 @@ extern int __setresuid (uid_t ruid, uid_t euid, uid_t suid); int seteuid (uid_t uid) { +#if __ASSUME_32BITUIDS > 0 + return INLINE_SYSCALL (setresuid32, 3, -1, uid, -1); +#else int result; /* First try the syscall. */ -#ifdef __NR_setresuid +# ifdef __NR_setresuid result = __setresuid (-1, uid, -1); -#if __ASSUME_SETRESUID_SYSCALL > 0 +# if __ASSUME_SETRESUID_SYSCALL > 0 if (0) -#else +# else if (result == -1 && errno == ENOSYS) -#endif +# endif /* No system call available. Use emulation. This may not work since `setreuid' also sets the saved user ID when UID is not equal to the real user ID, making it impossible to switch back. */ -#endif +# endif result = __setreuid (-1, uid); return result; +#endif } libc_hidden_def (seteuid) -- cgit v1.1