From 65f0beb9c5c3badb9da924f85a41c6f847bc1d0f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 20 Sep 2004 22:14:33 +0000 Subject: [PATCH] Update. * configure.in: If selinux has not explictly been requested, don't comment on it missing. --- ChangeLog | 3 +++ linuxthreads/ChangeLog | 7 +++++++ linuxthreads/Makefile | 11 ++++++----- linuxthreads/sysdeps/pthread/pthread.h | 30 ------------------------------ nptl/ChangeLog | 6 ++++++ nptl/Makefile | 10 +++++----- nptl/sysdeps/pthread/pthread.h | 30 ------------------------------ 7 files changed, 27 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cb4e51..7b1ad3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ 2004-09-20 Ulrich Drepper + * configure.in: If selinux has not explictly been requested, don't + comment on it missing. + * elf/dl-load.c: Define __stack_prot. * sysdeps/unix/sysv/linux/dl-execstack.c: Don't define __stack_prot here, just declare it. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 4a107da..3ac18f6 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2004-09-20 Ulrich Drepper + + * Versions: Remove exports for pthread_set*id_np functions. + * sysdeps/pthread/pthread.h: Remove pthread_set*id_np prototypes + for now. + * Makefile: Don't build pthread_set*id code for now. + 2004-09-19 Ulrich Drepper * sysdeps/pthread/pthread.h: Declare pthread_setgid_np, diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 79d412d..a16ae8d 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -51,11 +51,12 @@ libpthread-routines := attr cancel condvar join manager mutex ptfork \ ptw-open ptw-open64 ptw-pause ptw-pread ptw-pread64 \ ptw-pwrite ptw-pwrite64 ptw-tcdrain ptw-wait \ ptw-waitpid pt-system old_pthread_atfork pthread_atfork \ - ptcleanup \ - pthread_setuid pthread_seteuid pthread_setreuid \ - pthread_setresuid \ - pthread_setgid pthread_setegid pthread_setregid \ - pthread_setresgid + ptcleanup +# pthread_setuid pthread_seteuid pthread_setreuid \ +# pthread_setresuid \ +# pthread_setgid pthread_setegid pthread_setregid \ +# pthread_setresgid + # Don't generate deps for calls with no sources. See sysdeps/unix/Makefile. omit-deps = $(unix-syscalls:%=ptw-%) diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index 9589e96..86c7ff7 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -681,36 +681,6 @@ extern int pthread_atfork (void (*__prepare) (void), extern void pthread_kill_other_threads_np (void) __THROW; - -#ifdef __USE_GNU -/* Change UID of calling thread. */ -extern int pthread_setuid_np (__uid_t __uid) __THROW; - -/* Change effective UID of calling thread. */ -extern int pthread_seteuid_np (__uid_t __uid) __THROW; - -/* Change real and effective UID of calling thread. */ -extern int pthread_setreuid_np (__uid_t __ruid, __uid_t __euid) __THROW; - -/* Change real, effective, and saved UID of calling thread. */ -extern int pthread_setresuid_np (__uid_t __ruid, __uid_t __euid, - __uid_t __suid) __THROW; - - -/* Change GID of calling thread. */ -extern int pthread_setgid_np (__gid_t __gid) __THROW; - -/* Change effective GID of calling thread. */ -extern int pthread_setegid_np (__gid_t __gid) __THROW; - -/* Change real and effective GID of calling thread. */ -extern int pthread_setregid_np (__gid_t __rgid, __gid_t __egid) __THROW; - -/* Change real, effective, and saved GID of calling thread. */ -extern int pthread_setresgid_np (__gid_t __rgid, __gid_t __egid, - __gid_t __sgid) __THROW; -#endif - __END_DECLS #endif /* pthread.h */ diff --git a/nptl/ChangeLog b/nptl/ChangeLog index e4bcfed..53e745e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2004-09-20 Ulrich Drepper + + * sysdeps/pthread/pthread.h: Remove pthread_set*id_np prototypes + for now. + * Makefile: Don't build pthread_set*id code for now. + 2004-09-19 Ulrich Drepper * sysdeps/unix/sysv/linux/allocrtsig.c: Allocate second signal for diff --git a/nptl/Makefile b/nptl/Makefile index beaf6d7..db7f78e 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -115,11 +115,11 @@ libpthread-routines = init events version \ pthread_kill_other_threads \ pthread_getaffinity pthread_setaffinity \ pthread_attr_getaffinity pthread_attr_setaffinity \ - cleanup_routine unwind-forcedunwind \ - pthread_setuid pthread_seteuid pthread_setreuid \ - pthread_setresuid \ - pthread_setgid pthread_setegid pthread_setregid \ - pthread_setresgid + cleanup_routine unwind-forcedunwind +# pthread_setuid pthread_seteuid pthread_setreuid \ +# pthread_setresuid \ +# pthread_setgid pthread_setegid pthread_setregid \ +# pthread_setresgid libpthread-shared-only-routines = version pt-allocrtsig unwind-forcedunwind libpthread-static-only-routines = pthread_atfork diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 16f02d1..2766648 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -953,36 +953,6 @@ extern int pthread_atfork (void (*__prepare) (void), void (*__parent) (void), void (*__child) (void)) __THROW; - -#ifdef __USE_GNU -/* Change UID of calling thread. */ -extern int pthread_setuid_np (__uid_t __uid) __THROW; - -/* Change effective UID of calling thread. */ -extern int pthread_seteuid_np (__uid_t __uid) __THROW; - -/* Change real and effective UID of calling thread. */ -extern int pthread_setreuid_np (__uid_t __ruid, __uid_t __euid) __THROW; - -/* Change real, effective, and saved UID of calling thread. */ -extern int pthread_setresuid_np (__uid_t __ruid, __uid_t __euid, - __uid_t __suid) __THROW; - - -/* Change GID of calling thread. */ -extern int pthread_setgid_np (__gid_t __gid) __THROW; - -/* Change effective GID of calling thread. */ -extern int pthread_setegid_np (__gid_t __gid) __THROW; - -/* Change real and effective GID of calling thread. */ -extern int pthread_setregid_np (__gid_t __rgid, __gid_t __egid) __THROW; - -/* Change real, effective, and saved GID of calling thread. */ -extern int pthread_setresgid_np (__gid_t __rgid, __gid_t __egid, - __gid_t __sgid) __THROW; -#endif - __END_DECLS #endif /* pthread.h */ -- 2.7.4