From 85bd63313720ed5e7f10427ec5f0d2f59ee23614 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 12 Nov 2004 01:15:06 +0000 Subject: Remove sys/syscall.h, sys/types.h, linux/posix_types.h, sysdep.h and pthread-functions.h includes. Include setxid.h. Use INLINE_SETXID_SYSCALL macro instead of INLINE_SYSCALL, kill the HAVE_PTR__NPTL_SETXID guarded snippets. --- sysdeps/unix/sysv/linux/i386/setuid.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'sysdeps/unix/sysv/linux/i386/setuid.c') diff --git a/sysdeps/unix/sysv/linux/i386/setuid.c b/sysdeps/unix/sysv/linux/i386/setuid.c index 0d948fb775..9ebf76267f 100644 --- a/sysdeps/unix/sysv/linux/i386/setuid.c +++ b/sysdeps/unix/sysv/linux/i386/setuid.c @@ -18,14 +18,8 @@ #include #include -#include - -#include -#include - -#include +#include #include "kernel-features.h" -#include #ifdef __NR_setuid32 @@ -42,14 +36,14 @@ __setuid (uid_t uid) int result; #if __ASSUME_32BITUIDS > 0 && defined __NR_setuid32 - result = INLINE_SYSCALL (setuid32, 1, uid); + result = INLINE_SETXID_SYSCALL (setuid32, 1, uid); #else # ifdef __NR_setuid32 if (__libc_missing_32bit_uids <= 0) { int saved_errno = errno; - result = INLINE_SYSCALL (setuid32, 1, uid); + result = INLINE_SETXID_SYSCALL (setuid32, 1, uid); if (result == 0) goto out; if (errno != ENOSYS) @@ -67,22 +61,12 @@ __setuid (uid_t uid) return -1; } - result = INLINE_SYSCALL (setuid, 1, uid); + result = INLINE_SETXID_SYSCALL (setuid, 1, uid); # ifdef __NR_setuid32 out: # endif #endif -#if defined HAVE_PTR__NPTL_SETXID && !defined SINGLE_THREAD - if (result == 0 && __libc_pthread_functions.ptr__nptl_setxid != NULL) - { - struct xid_command cmd; - cmd.syscall_no = __NR_setuid32; - cmd.id[0] = uid; - __libc_pthread_functions.ptr__nptl_setxid (&cmd); - } -#endif - return result; } #ifndef __setuid -- cgit 1.4.1