diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-06-10 02:32:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-10 02:32:35 +0000 |
| commit | 54c924656eb5f55b7a6e95bf6c31b6f3bc1e09dc (patch) | |
| tree | 5a89bd611c98acce66bf0ec7e101eb0873623d7c /sysdeps/unix/sysv/linux/i386/setreuid.c | |
| parent | 5b318f8556255638907de5251e3df225a6cfcdff (diff) | |
| download | glibc-54c924656eb5f55b7a6e95bf6c31b6f3bc1e09dc.tar.gz glibc-54c924656eb5f55b7a6e95bf6c31b6f3bc1e09dc.tar.xz glibc-54c924656eb5f55b7a6e95bf6c31b6f3bc1e09dc.zip | |
Update.
2003-06-09 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_SETRESGID_SYSCALL): Define. * sysdeps/unix/sysv/linux/setegid.c: Use __ASSUME_SETRESGID_SYSCALL instead of __ASSUME_SETRESUID_SYSCALL. (setegid): Only use setresgid32 inline syscall if __NR_setresgid32 is defined. * sysdeps/unix/sysv/linux/seteuid.c (seteuid): Only use setresgid32 inline syscall if __NR_setresuid32 is defined. * sysdeps/unix/sysv/linux/i386/setegid.c (setegid): Use __ASSUME_SETRESGID_SYSCALL instead of __ASSUME_SETRESUID_SYSCALL. * sysdeps/unix/sysv/linux/i386/setregid.c: Backout last changes. * sysdeps/unix/sysv/linux/i386/setreuid.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c (setegid): Protect code handling non-existant setresgid32 syscall with #if __ASSUME_SETRESGID_SYSCALL == 0. 2003-06-09 Andreas Schwab <schwab@suse.de> * sunrpc/Makefile (generated): Remove rpc-proto.c, rpc-proto.d. ($(rpcsvc:%.x=$(objpfx)x%$o)): Don't depend on $(objpfx)rpc-proto.d. (rpcsvc-dt-files, rpcsvc-depfiles): Define. Include $(rpcsvc-depfiles) instead of $(objpfx)rpc-proto.d. ($(objpfx)rpc-proto.d, $(objpfx)rpc-proto.c): Remove rules.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/setreuid.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/setreuid.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/setreuid.c b/sysdeps/unix/sysv/linux/i386/setreuid.c index 0867170e49..efd51dffd8 100644 --- a/sysdeps/unix/sysv/linux/i386/setreuid.c +++ b/sysdeps/unix/sysv/linux/i386/setreuid.c @@ -42,15 +42,15 @@ int __setreuid (uid_t ruid, uid_t euid) { #if __ASSUME_32BITUIDS > 0 - return INLINE_SYSCALL (setresuid32, 3, ruid, euid, -1); + return INLINE_SYSCALL (setreuid32, 2, ruid, euid); #else -# ifdef __NR_setresuid32 +# ifdef __NR_setreuid32 if (__libc_missing_32bit_uids <= 0) { int result; int saved_errno = errno; - result = INLINE_SYSCALL (setresuid32, 3, ruid, euid, -1); + result = INLINE_SYSCALL (setreuid32, 2, ruid, euid); if (result == 0 || errno != ENOSYS) return result; @@ -66,13 +66,7 @@ __setreuid (uid_t ruid, uid_t euid) return -1; } -# ifdef __NR_setresuid - itn result = INLINE_SYSCALL (setresuid, 3, ruid, euid, -1); -# endif - if (result == -1 && errno == ENOSYS) - result = INLINE_SYSCALL (setreuid, 2, ruid, euid); - - return result; + return INLINE_SYSCALL (setreuid, 2, ruid, euid); #endif } weak_alias (__setreuid, setreuid) |