diff options
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 4 | ||||
| -rw-r--r-- | sunrpc/Makefile | 28 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/setegid.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/setregid.c | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/setreuid.c | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/setegid.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/seteuid.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c | 4 |
11 files changed, 66 insertions, 44 deletions
@@ -1,3 +1,30 @@ +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. + 2003-06-08 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/seteuid.c (seteuid): Use setresuid32 diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index a7d422e837..be8bf8ca45 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2003-06-09 Andreas Schwab <schwab@suse.de> + + * Makefile: Move inclusion of ../Rules down after extra-objs is + fully known. + 2003-06-06 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: New sequences for diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index f105bd6454..3d45b81f19 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -121,7 +121,7 @@ ifeq (yes,$(build-shared)) tests-nodelete-yes = unload endif -include ../Rules +all: # Make this the default target; it will be defined in Rules. # What we install as libpthread.so for programs to link against is in fact a # link script. It contains references for the various libraries we need. @@ -204,6 +204,8 @@ else libc-link.so = $(common-objpfx)libc.so endif +include ../Rules + # Depend on libc.so so a DT_NEEDED is generated in the shared objects. # This ensures they will load libc.so for needed symbols if loaded by # a statically-linked program that hasn't already loaded it. diff --git a/sunrpc/Makefile b/sunrpc/Makefile index 07c66a82c5..b7492e4dab 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -54,7 +54,7 @@ headers = $(addprefix rpc/,auth.h auth_unix.h clnt.h netdb.h pmap_clnt.h \ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h install-others = $(inst_sysconfdir)/rpc generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpc-proto.c rpc-proto.d rpcgen + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen generated-dirs := rpcsvc routines := auth_none auth_unix authuxprot bindrsvprt \ @@ -168,26 +168,20 @@ $(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)rpcgen # Gratuitous dependency on generated .c file here just gets it mentioned to # avoid being an intermediate file and getting removed. define o-iterator-doit -$(rpcsvc:%.x=$(objpfx)x%$o): $(objpfx)x%$o: $(objpfx)x%.c $(objpfx)rpcsvc/%.h \ - $(objpfx)rpc-proto.d +$(rpcsvc:%.x=$(objpfx)x%$o): $(objpfx)x%$o: $(objpfx)x%.c $(objpfx)rpcsvc/%.h endef object-suffixes-left = $(filter-out $(librpcsvc-inhibit-o),$(object-suffixes)) include $(o-iterator) -ifndef no_deps --include $(objpfx)rpc-proto.d +rpcsvc-dt-files := $(foreach o,$(filter-out $(librpcsvc-inhibit-o),\ + $(object-suffixes)),\ + $(rpcsvc:%.x=$(objpfx)x%$o.dt)) +rpcsvc-depfiles := $(patsubst %.dt,%.d,$(wildcard $(rpcsvc-dt-files))) \ + $(wildcard $(rpcsvc-dt-files:.dt=.d)) +ifdef rpcsvc-depfiles +ifneq ($(no_deps),t) +-include $(rpcsvc-depfiles) +endif endif - -$(objpfx)rpc-proto.d: $(objpfx)%.d: $(objpfx)%.c - $(+make-deps) -# Special file to generate dependencies for the RPC service objects. -# Collect all include directives from the source files. -$(objpfx)rpc-proto.c: $(rpcsvc:%=rpcsvc/%) - $(make-target-directory) - { echo '#include <rpc/types.h>'; \ - echo '#include <rpc/xdr.h>'; \ - echo '#include <rpc/rpc.h>'; \ - sed -n '/^%#include/s/%//p' $^; } > $@T - mv -f $@T $@ $(objpfx)thrsvc: $(shared-thread-library) diff --git a/sysdeps/unix/sysv/linux/i386/setegid.c b/sysdeps/unix/sysv/linux/i386/setegid.c index 4dc79c7936..fcd6cf1827 100644 --- a/sysdeps/unix/sysv/linux/i386/setegid.c +++ b/sysdeps/unix/sysv/linux/i386/setegid.c @@ -39,7 +39,7 @@ setegid (gid) /* First try the syscall. */ # ifdef __NR_setresgid result = __setresgid (-1, gid, -1); -# if __ASSUME_SETRESUID_SYSCALL > 0 +# if __ASSUME_SETRESGID_SYSCALL > 0 if (0) # else if (result == -1 && errno == ENOSYS) diff --git a/sysdeps/unix/sysv/linux/i386/setregid.c b/sysdeps/unix/sysv/linux/i386/setregid.c index 343bbf4b40..05ed05bbc8 100644 --- a/sysdeps/unix/sysv/linux/i386/setregid.c +++ b/sysdeps/unix/sysv/linux/i386/setregid.c @@ -42,15 +42,15 @@ int __setregid (gid_t rgid, gid_t egid) { #if __ASSUME_32BITUIDS > 0 - return INLINE_SYSCALL (setresgid32, 3, rgid, egid, -1); + return INLINE_SYSCALL (setregid32, 2, rgid, egid); #else -# ifdef __NR_setresgid32 +# ifdef __NR_setregid32 if (__libc_missing_32bit_uids <= 0) { int result; int saved_errno = errno; - result = INLINE_SYSCALL (setresgid32, 3, rgid, egid, -1); + result = INLINE_SYSCALL (setregid32, 2, rgid, egid); if (result == 0 || errno != ENOSYS) return result; @@ -66,13 +66,7 @@ __setregid (gid_t rgid, gid_t egid) return -1; } -# ifdef __NR_setresgid - int result = INLINE_SYSCALL (setresgid, 3, rgid, egid, -1); -# endif - if (result == -1 && errno == ENOSYS) - result = INLINE_SYSCALL (setregid, 2, rgid, egid); - - return result; + return INLINE_SYSCALL (setregid, 2, rgid, egid); #endif } weak_alias (__setregid, setregid) 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) diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index a95559de94..e49d1f48a8 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -127,6 +127,10 @@ # define __ASSUME_SETRESUID_SYSCALL 1 #endif +#if __LINUX_KERNEL_VERSION >= 131879 +# define __ASSUME_SETRESGID_SYSCALL 1 +#endif + /* Linux 2.3.39 introduced IPC64. Except for powerpc. */ #if __LINUX_KERNEL_VERSION >= 131879 && !defined __powerpc__ # define __ASSUME_IPC64 1 diff --git a/sysdeps/unix/sysv/linux/setegid.c b/sysdeps/unix/sysv/linux/setegid.c index 6643a9da79..34e64a3dee 100644 --- a/sysdeps/unix/sysv/linux/setegid.c +++ b/sysdeps/unix/sysv/linux/setegid.c @@ -24,7 +24,7 @@ #include <sysdep.h> #include "kernel-features.h" -#if defined __NR_setresgid || __ASSUME_SETRESUID_SYSCALL > 0 +#if defined __NR_setresgid || __ASSUME_SETRESGID_SYSCALL > 0 extern int __setresgid (gid_t rgid, gid_t egid, gid_t sgid); @@ -39,12 +39,12 @@ setegid (gid_t gid) return -1; } -# if __ASSUME_32BITUIDS > 0 +# if __ASSUME_32BITUIDS > 0 && defined __NR_setresgid32 return INLINE_SYSCALL (setresgid32, 3, -1, gid, -1); # else /* First try the syscall. */ result = __setresgid (-1, gid, -1); -# if __ASSUME_SETRESUID_SYSCALL == 0 +# if __ASSUME_SETRESGID_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use emulation. This may not work since `setregid' also sets the saved group ID when GID is not diff --git a/sysdeps/unix/sysv/linux/seteuid.c b/sysdeps/unix/sysv/linux/seteuid.c index 6570740af7..a1832d64bc 100644 --- a/sysdeps/unix/sysv/linux/seteuid.c +++ b/sysdeps/unix/sysv/linux/seteuid.c @@ -39,7 +39,7 @@ seteuid (uid_t uid) return -1; } -# if __ASSUME_32BITUIDS > 0 +# if __ASSUME_32BITUIDS > 0 && defined __NR_setresuid32 return INLINE_SYSCALL (setresuid32, 3, -1, uid, -1); # else /* First try the syscall. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c b/sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c index 11643f6d39..96f807484d 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 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 @@ -38,11 +38,13 @@ setegid (gid_t gid) /* First try the syscall. */ result = __setresgid (-1, gid, -1); +# if __ASSUME_SETRESGID_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use emulation. This may not work since `setregid' also sets the saved group ID when GID is not equal to the real group ID, making it impossible to switch back. */ result = __setregid (-1, gid); +# endif return result; } |