diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-09-20 00:16:11 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-20 00:16:11 +0000 |
| commit | 2edb61e3f955bfcc9dd3cb6b3b1acfe4806234a6 (patch) | |
| tree | eb3ba83120d92a0ea9955520f2df4e00a22bc884 /sysdeps/unix/sysv/linux/i386/setuid.c | |
| parent | 29e11320c90722aec6335a5f8d8af84d12ba3c6b (diff) | |
Update.
* sysdeps/unix/sysv/linux/setegid.c [HAVE_PTR__NPTL_SETXID]: Call
callback to set IDs in all other threads as well.
* sysdeps/unix/sysv/linux/seteuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setegid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/seteuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setgid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setreuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setreuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setresuid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setresuid.c: Likewise.
* sysdeps/unix/sysv/linux/setuid.c: New file.
* sysdeps/unix/sysv/linux/setgid.c: New file.
* sysdeps/unix/sysv/linux/setreuid.c: New file.
* sysdeps/unix/sysv/linux/setregid.c: New file.
* sysdeps/unix/sysv/linux/setresuid.c: New file.
* sysdeps/unix/sysv/linux/setresgid.c: New file.
* sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NCS.
* sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c: Use x86 version.
* sysdeps/unix/sysv/linux/sparc/sparc32/seteuid.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/setresgid.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc32/setresuid.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: Remove setresgid
and setresuid.
* nscd/aicache.c: Use pthread_seteuid_np instead of seteuid.
* nscd/grpcache.c: Likewise.
* nscd/hstcache.c: Likewise.
* nscd/pwdcache.c: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/setuid.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/setuid.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/setuid.c b/sysdeps/unix/sysv/linux/i386/setuid.c index 69bf42596f..a11fb7f60c 100644 --- a/sysdeps/unix/sysv/linux/i386/setuid.c +++ b/sysdeps/unix/sysv/linux/i386/setuid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2003, 2004 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 @@ -25,6 +25,8 @@ #include <linux/posix_types.h> #include "kernel-features.h" +#include <pthread-functions.h> + #ifdef __NR_setuid32 # if __ASSUME_32BITUIDS == 0 @@ -37,8 +39,10 @@ extern int __libc_missing_32bit_uids; int __setuid (uid_t uid) { -#if __ASSUME_32BITUIDS > 0 - return INLINE_SYSCALL (setuid32, 1, uid); + int result; + +#if __ASSUME_32BITUIDS > 0 && defined __NR_setuid32 + result = INLINE_SYSCALL (setuid32, 1, uid); #else # ifdef __NR_setuid32 if (__libc_missing_32bit_uids <= 0) @@ -47,7 +51,9 @@ __setuid (uid_t uid) int saved_errno = errno; result = INLINE_SYSCALL (setuid32, 1, uid); - if (result == 0 || errno != ENOSYS) + if (result == 0) + goto out; + if (errno != ENOSYS) return result; __set_errno (saved_errno); @@ -62,7 +68,24 @@ __setuid (uid_t uid) return -1; } - return INLINE_SYSCALL (setuid, 1, uid); + result = INLINE_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 weak_alias (__setuid, setuid) +#endif |