aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog74
-rw-r--r--NEWS10
-rw-r--r--Versions.def1
-rw-r--r--elf/rtld-Rules10
-rw-r--r--hurd/Makefile4
-rw-r--r--hurd/errno-loc.c (renamed from hurd/errno.c)0
-rw-r--r--include/unistd.h8
-rw-r--r--posix/Makefile1
-rw-r--r--posix/Versions7
-rw-r--r--posix/unistd.h18
-rw-r--r--sysdeps/generic/getresgid.c7
-rw-r--r--sysdeps/generic/getresuid.c7
-rw-r--r--sysdeps/generic/setresgid.c35
-rw-r--r--sysdeps/generic/setresuid.c35
-rw-r--r--sysdeps/mach/hurd/getresgid.c62
-rw-r--r--sysdeps/mach/hurd/getresuid.c62
-rw-r--r--sysdeps/mach/hurd/setresgid.c77
-rw-r--r--sysdeps/mach/hurd/setresuid.c77
-rw-r--r--sysdeps/unix/sysv/linux/alpha/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/hppa/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/i386/getresgid.c7
-rw-r--r--sysdeps/unix/sysv/linux/i386/getresuid.c7
-rw-r--r--sysdeps/unix/sysv/linux/i386/setresgid.c13
-rw-r--r--sysdeps/unix/sysv/linux/i386/setresuid.c10
-rw-r--r--sysdeps/unix/sysv/linux/ia64/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/mips/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list8
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list6
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/syscalls.list2
34 files changed, 521 insertions, 52 deletions
diff --git a/ChangeLog b/ChangeLog
index 33f98b0..fb5b0ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,77 @@
+2002-10-13 Roland McGrath <roland@frob.com>
+
+ * elf/rtld-Rules ($(objpfx)rtld-libc.a): Use $(verbose) in ar command.
+
+ * sysdeps/mach/hurd/getresuid.c: New file.
+ * sysdeps/mach/hurd/getresgid.c: New file.
+ * sysdeps/mach/hurd/setresuid.c: New file.
+ * sysdeps/mach/hurd/setresgid.c: New file.
+
+ * posix/unistd.h [__USE_GNU] (getresuid, getresgid, setresuid,
+ setresgid): Declare them.
+ * NEWS: Mention it.
+ * include/unistd.h
+ (__getresuid, __getresgid, __setresuid, __setresgid): Declare them,
+ add libc_hidden_proto.
+ * posix/Versions (libc: GLIBC_2.3.2): New set. Add
+ getresuid, getresgid, setresuid, setresgid here.
+ * Versions.def (libc): Define GLIBC_2.3.2 set.
+ * sysdeps/generic/getresuid.c (__getresuid): Fix argument types.
+ Add libc_hidden_def.
+ * sysdeps/generic/getresgid.c (__getresgid): Likewise.
+ * sysdeps/generic/setresgid.c: New file.
+ * sysdeps/generic/setresuid.c: New file.
+ * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc]
+ (sysdep_routines): Don't add getresuid and getresgid here.
+ * sysdeps/unix/sysv/linux/arm/Makefile [$(subdir) = misc]
+ (sysdep_routines): Don't add setresuid and setresgid here.
+ * sysdeps/unix/sysv/linux/cris/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/sh/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/i386/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
+ * posix/Makefile (routines): Add them all here instead.
+ * sysdeps/unix/sysv/linux/i386/getresuid.c (getresuid): Renamed to
+ __getresuid. Add libc_hidden_def for that, and weak alias to old name.
+ * sysdeps/unix/sysv/linux/i386/getresgid.c (getresgid): Renamed to
+ __getresgid. Add libc_hidden_def for that, and weak alias to old name.
+ * sysdeps/unix/sysv/linux/i386/setresuid.c: Add libc_hidden_def.
+ [! __NR_setresuid]: Include generic file.
+ * sysdeps/unix/sysv/linux/i386/setresgid.c (setresgid): Renamed to
+ __setresgid. Add libc_hidden_def for that, and weak alias to old name.
+ [! __NR_setresuid]: Include generic file.
+ * sysdeps/unix/sysv/linux/syscalls.list (setresuid, setresgid):
+ Caller is - now, not EXTRA.
+ * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
+ (setresuid, setresgid, getresuid, getresgid): Likewise.
+ * sysdeps/unix/sysv/linux/syscalls.list (getresuid, getresgid):
+ Add these calls here.
+ * sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove them here.
+ * sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
+
+ * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc]
+ (sysdep_routines): Add setfsuid and setfsgid here.
+ * sysdeps/unix/sysv/linux/arm/Makefile: Not here.
+ * sysdeps/unix/sysv/linux/sparc/sparc32/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/cris/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/sh/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/i386/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
+
+ * hurd/errno.c: Renamed to ...
+ * hurd/errno-loc.c: ... this.
+ * hurd/Makefile (routines): errno -> errno-loc
+
2002-10-13 Ulrich Drepper <drepper@redhat.com>
* po/de.po: Update from translation team.
diff --git a/NEWS b/NEWS
index 095ea50..7d80d1a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,18 @@
-GNU C Library NEWS -- history of user-visible changes. 2002-10-2
+GNU C Library NEWS -- history of user-visible changes. 2002-10-13
Copyright (C) 1992-2001, 2002 Free Software Foundation, Inc.
See the end for copying conditions.
Please send GNU C library bug reports using the `glibcbug' script to
<bugs@gnu.org>. Please send questions and suggestions to <bug-glibc@gnu.org>.
+Version 2.3.2
+
+* The functions getresuid, getresgid, setresuid, and setresgid, which
+ have long been available on Linux, are now declared in <unistd.h>
+ and are now also available on the Hurd.
+
+* ELF thread-local storage support (TLS) now works on x86-64.
+
Version 2.3
* Masahide Washizawa contributed iconv modules for IBM1163 and IBM1164
diff --git a/Versions.def b/Versions.def
index fe32a8f..d47fb5d 100644
--- a/Versions.def
+++ b/Versions.def
@@ -17,6 +17,7 @@ libc {
GLIBC_2.2.6
GLIBC_2.3
GLIBC_2.3.1
+ GLIBC_2.3.2
%ifdef USE_IN_LIBIO
HURD_CTHREADS_0.3
%endif
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index 03fe25d..98bb24a 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -42,10 +42,18 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\
$(addprefix $(common-objpfx)$(dir)/rtld-,\
$(rtld-$(dir))))
@-rm -f $@T
- $(AR) cq $@T $^
+ $(AR) cq$(verbose) $@T $^
$(RANLIB) $@T
mv -f $@T $@
+# Use the verbose option of ar and tar when not running silently.
+ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s
+verbose := v
+else # -s
+verbose :=
+endif # not -s
+
+
# For each subdirectory, define a pattern rule that makes all of that
# subdirectory's modules at once with one recursive make command.
object-suffixes-left := $(rtld-subdirs)
diff --git a/hurd/Makefile b/hurd/Makefile
index 9487c96..ccf596c 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,99,2001
+# Copyright (C) 1991,92,93,94,95,96,97,98,99,2001,2002
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -59,7 +59,7 @@ routines = hurdstartup hurdinit \
fopenport \
vpprintf \
ports-get ports-set hurdports hurdmsg \
- errno \
+ errno-loc \
$(sig) $(dtable) $(inlines) port-cleanup report-wait
sig = hurdsig hurdfault siginfo hurd-raise preempt-sig \
trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \
diff --git a/hurd/errno.c b/hurd/errno-loc.c
index 85e4e7d..85e4e7d 100644
--- a/hurd/errno.c
+++ b/hurd/errno-loc.c
diff --git a/include/unistd.h b/include/unistd.h
index a5d15aa..21d248e 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -95,6 +95,14 @@ extern int __setgid (__gid_t __gid);
extern int __setpgid (__pid_t __pid, __pid_t __pgid);
libc_hidden_proto (__setpgid)
extern int __setregid (__gid_t __rgid, __gid_t __egid);
+extern int __getresuid (__uid_t *__euid, __uid_t *__ruid, __uid_t *__suid);
+extern int __getresgid (__gid_t *__egid, __gid_t *__rgid, __gid_t *__sgid);
+extern int __setresuid (__uid_t __euid, __uid_t __ruid, __uid_t __suid);
+extern int __setresgid (__gid_t __egid, __gid_t __rgid, __gid_t __sgid);
+libc_hidden_proto (__getresuid)
+libc_hidden_proto (__getresgid)
+libc_hidden_proto (__setresuid)
+libc_hidden_proto (__setresgid)
extern __pid_t __vfork (void);
extern int __ttyname_r (int __fd, char *__buf, size_t __buflen);
extern int __isatty (int __fd);
diff --git a/posix/Makefile b/posix/Makefile
index aebd8b3..ede9d1f 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -45,6 +45,7 @@ routines := \
getpid getppid \
getuid geteuid getgid getegid getgroups setuid setgid group_member \
getpgid setpgid getpgrp bsd-getpgrp setpgrp getsid setsid \
+ getresuid getresgid setresuid setresgid \
getlogin getlogin_r setlogin \
pathconf sysconf fpathconf \
glob glob64 fnmatch regex \
diff --git a/posix/Versions b/posix/Versions
index a5378d1..d20e552 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -109,6 +109,13 @@ libc {
# For syscall wrapper
__nanosleep;
}
+ GLIBC_2.3.2 {
+ # Note that these symbols appear in sysdeps/unix/sysv/linux/Versions
+ # under GLIBC_2.0; the first instance in the script is taken as the
+ # default, so linux configurations put them in GLIBC_2.0 while other
+ # configuration put them in GLIBC_2.3.2.
+ getresuid; getresgid; setresuid; setresgid;
+ }
GLIBC_PRIVATE {
# functions which have an additional interface since they are
# are cancelable.
diff --git a/posix/unistd.h b/posix/unistd.h
index 792c80a..9c27c84 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -640,6 +640,24 @@ extern int setregid (__gid_t __rgid, __gid_t __egid) __THROW;
extern int setegid (__gid_t __gid) __THROW;
#endif /* Use BSD. */
+#ifdef __USE_GNU
+/* Fetch the effective user ID, real user ID, and saved-set user ID,
+ of the calling process. */
+extern int getresuid (__uid_t *__euid, __uid_t *__ruid, __uid_t *__suid);
+
+/* Fetch the effective group ID, real group ID, and saved-set group ID,
+ of the calling process. */
+extern int getresgid (__gid_t *__egid, __gid_t *__rgid, __gid_t *__sgid);
+
+/* Set the effective user ID, real user ID, and saved-set user ID,
+ of the calling process to EUID, RUID, and SUID, respectively. */
+extern int setresuid (__uid_t __euid, __uid_t __ruid, __uid_t __suid);
+
+/* Set the effective group ID, real group ID, and saved-set group ID,
+ of the calling process to EGID, RGID, and SGID, respectively. */
+extern int setresgid (__gid_t __egid, __gid_t __rgid, __gid_t __sgid);
+#endif
+
/* Clone the calling process, creating an exact copy.
Return -1 for errors, 0 to the new process,
diff --git a/sysdeps/generic/getresgid.c b/sysdeps/generic/getresgid.c
index 92f9019..d6a9b52 100644
--- a/sysdeps/generic/getresgid.c
+++ b/sysdeps/generic/getresgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,1998,2002 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
@@ -19,12 +19,15 @@
#include <errno.h>
#include <unistd.h>
+/* Fetch the effective group ID, real group ID, and saved-set group ID,
+ of the calling process. */
int
-__getresgid (gid_t egid, gid_t rgid, gid_t sgid)
+__getresgid (gid_t *egid, gid_t *rgid, gid_t *sgid)
{
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (__getresgid)
stub_warning (getresgid)
weak_alias (__getresgid, getresgid)
diff --git a/sysdeps/generic/getresuid.c b/sysdeps/generic/getresuid.c
index 1cf4326..227d6b7 100644
--- a/sysdeps/generic/getresuid.c
+++ b/sysdeps/generic/getresuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,1998,2002 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
@@ -19,12 +19,15 @@
#include <errno.h>
#include <unistd.h>
+/* Fetch the effective user ID, real user ID, and saved-set user ID,
+ of the calling process. */
int
-__getresuid (uid_t euid, uid_t ruid, uid_t suid)
+__getresuid (uid_t *euid, uid_t *ruid, uid_t *suid)
{
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (__getresuid)
stub_warning (getresuid)
weak_alias (__getresuid, getresuid)
diff --git a/sysdeps/generic/setresgid.c b/sysdeps/generic/setresgid.c
new file mode 100644
index 0000000..78e308c
--- /dev/null
+++ b/sysdeps/generic/setresgid.c
@@ -0,0 +1,35 @@
+/* setresgid -- set effective group ID, real group ID, and saved-set group ID
+ Copyright (C) 2002 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <unistd.h>
+
+/* Set the effective group ID, real group ID, and saved-set group ID,
+ of the calling process to EGID, RGID, and SGID, respectively. */
+int
+__setresgid (gid_t egid, gid_t rgid, gid_t sgid)
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+libc_hidden_def (__setresgid)
+stub_warning (setresgid)
+
+weak_alias (__setresgid, setresgid)
+#include <stub-tag.h>
diff --git a/sysdeps/generic/setresuid.c b/sysdeps/generic/setresuid.c
new file mode 100644
index 0000000..430b63b
--- /dev/null
+++ b/sysdeps/generic/setresuid.c
@@ -0,0 +1,35 @@
+/* setresuid -- set effective user ID, real user ID, and saved-set user ID
+ Copyright (C) 2002 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <unistd.h>
+
+/* Set the effective user ID, real user ID, and saved-set user ID,
+ of the calling process to EUID, RUID, and SUID, respectively. */
+int
+__setresuid (uid_t euid, uid_t ruid, uid_t suid)
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+libc_hidden_def (__setresuid)
+stub_warning (setresuid)
+
+weak_alias (__setresuid, setresuid)
+#include <stub-tag.h>
diff --git a/sysdeps/mach/hurd/getresgid.c b/sysdeps/mach/hurd/getresgid.c
new file mode 100644
index 0000000..a96aa49
--- /dev/null
+++ b/sysdeps/mach/hurd/getresgid.c
@@ -0,0 +1,62 @@
+/* getresgid -- fetch effective group ID, real group ID, and saved-set group ID
+ Copyright (C) 2002 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <unistd.h>
+#include <hurd.h>
+#include <hurd/id.h>
+
+/* Fetch the effective group ID, real group ID, and saved-set group ID,
+ of the calling process. */
+int
+__getresgid (gid_t *egid, gid_t *rgid, gid_t *sgid)
+{
+ error_t err;
+ gid_t eff, real, saved;
+
+ HURD_CRITICAL_BEGIN;
+ __mutex_lock (&_hurd_id.lock);
+
+ err = _hurd_check_ids ();
+ if (!err)
+ {
+ if (_hurd_id.aux.ngids < 1)
+ /* We do not even have a real GID. */
+ err = EGRATUITOUS;
+ else
+ {
+ real = _hurd_id.aux.gids[0];
+ saved = _hurd_id.aux.ngids < 2 ? real :_hurd_id.aux.gids[1];
+ eff = _hurd_id.gen.ngids < 1 ? real : _hurd_id.gen.gids[0];
+ }
+ }
+
+ __mutex_unlock (&_hurd_id.lock);
+ HURD_CRITICAL_END;
+
+ if (err)
+ return __hurd_fail (err);
+
+ *egid = eff;
+ *rgid = real;
+ *sgid = saved;
+ return 0;
+}
+libc_hidden_def (__getresgid)
+weak_alias (__getresgid, getresgid)
diff --git a/sysdeps/mach/hurd/getresuid.c b/sysdeps/mach/hurd/getresuid.c
new file mode 100644
index 0000000..f4bfaea
--- /dev/null
+++ b/sysdeps/mach/hurd/getresuid.c
@@ -0,0 +1,62 @@
+/* getresuid -- fetch effective user ID, real user ID, and saved-set user ID
+ Copyright (C) 2002 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <unistd.h>
+#include <hurd.h>
+#include <hurd/id.h>
+
+/* Fetch the effective user ID, real user ID, and saved-set user ID,
+ of the calling process. */
+int
+__getresuid (uid_t *euid, uid_t *ruid, uid_t *suid)
+{
+ error_t err;
+ uid_t eff, real, saved;
+
+ HURD_CRITICAL_BEGIN;
+ __mutex_lock (&_hurd_id.lock);
+
+ err = _hurd_check_ids ();
+ if (!err)
+ {
+ if (_hurd_id.aux.nuids < 1)
+ /* We do not even have a real UID. */
+ err = EGRATUITOUS;
+ else
+ {
+ real = _hurd_id.aux.uids[0];
+ saved = _hurd_id.aux.nuids < 2 ? real :_hurd_id.aux.uids[1];
+ eff = _hurd_id.gen.nuids < 1 ? real : _hurd_id.gen.uids[0];
+ }
+ }
+
+ __mutex_unlock (&_hurd_id.lock);
+ HURD_CRITICAL_END;
+
+ if (err)
+ return __hurd_fail (err);
+
+ *euid = eff;
+ *ruid = real;
+ *suid = saved;
+ return 0;
+}
+libc_hidden_def (__getresuid)
+weak_alias (__getresuid, getresuid)
diff --git a/sysdeps/mach/hurd/setresgid.c b/sysdeps/mach/hurd/setresgid.c
new file mode 100644
index 0000000..d0ee412
--- /dev/null
+++ b/sysdeps/mach/hurd/setresgid.c
@@ -0,0 +1,77 @@
+/* setresgid -- set effective group ID, real group ID, and saved-set group ID
+ Copyright (C) 2002 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <unistd.h>
+#include <hurd.h>
+#include <hurd/id.h>
+
+/* Set the effective group ID, real group ID, and saved-set group ID,
+ of the calling process to EGID, RGID, and SGID, respectively. */
+int
+__setresgid (gid_t egid, gid_t rgid, gid_t sgid)
+{
+ auth_t newauth;
+ error_t err;
+ gid_t agids[2] = { rgid, sgid };
+
+ HURD_CRITICAL_BEGIN;
+ __mutex_lock (&_hurd_id.lock);
+ err = _hurd_check_ids ();
+
+ if (!err)
+ {
+ /* Make a new auth handle which has EGID as the first element in the
+ list of effective gids. */
+
+ if (_hurd_id.gen.ngids > 0)
+ {
+ _hurd_id.gen.gids[0] = egid;
+ _hurd_id.valid = 0;
+ }
+ if (_hurd_id.aux.ngids > 1)
+ {
+ _hurd_id.aux.gids[0] = rgid;
+ _hurd_id.aux.gids[1] = sgid;
+ _hurd_id.valid = 0;
+ }
+
+ err = __USEPORT (AUTH, __auth_makeauth
+ (port, NULL, MACH_MSG_TYPE_COPY_SEND, 0,
+ _hurd_id.gen.uids, _hurd_id.gen.nuids,
+ _hurd_id.aux.uids, _hurd_id.aux.nuids,
+ _hurd_id.gen.ngids ? _hurd_id.gen.gids : &egid,
+ _hurd_id.gen.ngids ?: 1,
+ _hurd_id.aux.ngids > 1 ? _hurd_id.aux.gids : agids,
+ _hurd_id.aux.ngids > 1 ? _hurd_id.aux.ngids : 2,
+ &newauth));
+ }
+
+ __mutex_unlock (&_hurd_id.lock);
+ HURD_CRITICAL_END;
+
+ if (err)
+ return __hurd_fail (err);
+
+ /* Install the new handle and reauthenticate everything. */
+ err = __setauth (newauth);
+ __mach_port_deallocate (__mach_task_self (), newauth);
+ return err;
+}
+libc_hidden_def (__setresgid)
diff --git a/sysdeps/mach/hurd/setresuid.c b/sysdeps/mach/hurd/setresuid.c
new file mode 100644
index 0000000..2d05dbc
--- /dev/null
+++ b/sysdeps/mach/hurd/setresuid.c
@@ -0,0 +1,77 @@
+/* setresuid -- set effective user ID, real user ID, and saved-set user ID
+ Copyright (C) 2002 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <unistd.h>
+#include <hurd.h>
+#include <hurd/id.h>
+
+/* Set the effective user ID, real user ID, and saved-set user ID,
+ of the calling process to EUID, RUID, and SUID, respectively. */
+int
+__setresuid (uid_t euid, uid_t ruid, uid_t suid)
+{
+ auth_t newauth;
+ error_t err;
+ uid_t auids[2] = { ruid, suid };
+
+ HURD_CRITICAL_BEGIN;
+ __mutex_lock (&_hurd_id.lock);
+ err = _hurd_check_ids ();
+
+ if (!err)
+ {
+ /* Make a new auth handle which has EUID as the first element in the
+ list of effective uids. */
+
+ if (_hurd_id.gen.nuids > 0)
+ {
+ _hurd_id.gen.uids[0] = euid;
+ _hurd_id.valid = 0;
+ }
+ if (_hurd_id.aux.nuids > 1)
+ {
+ _hurd_id.aux.uids[0] = ruid;
+ _hurd_id.aux.uids[1] = suid;
+ _hurd_id.valid = 0;
+ }
+
+ err = __USEPORT (AUTH, __auth_makeauth
+ (port, NULL, MACH_MSG_TYPE_COPY_SEND, 0,
+ _hurd_id.gen.nuids ? _hurd_id.gen.uids : &euid,
+ _hurd_id.gen.nuids ?: 1,
+ _hurd_id.aux.nuids > 1 ? _hurd_id.aux.uids : auids,
+ _hurd_id.aux.nuids > 1 ? _hurd_id.aux.nuids : 2,
+ _hurd_id.gen.gids, _hurd_id.gen.ngids,
+ _hurd_id.aux.gids, _hurd_id.aux.ngids,
+ &newauth));
+ }
+
+ __mutex_unlock (&_hurd_id.lock);
+ HURD_CRITICAL_END;
+
+ if (err)
+ return __hurd_fail (err);
+
+ /* Install the new handle and reauthenticate everything. */
+ err = __setauth (newauth);
+ __mach_port_deallocate (__mach_task_self (), newauth);
+ return err;
+}
+libc_hidden_def (__setresuid)
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index 059f753..7c1a0be 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -55,9 +55,6 @@ shutdown - shutdown 2 __shutdown shutdown
socket - socket 3 __socket socket
socketpair - socketpair 4 __socketpair socketpair
-getresuid - getresuid 3 getresuid
-getresgid - getresgid 3 getresgid
-
# access pci space protected from machine checks:
pciconfig_read EXTRA pciconfig_read 5 pciconfig_read
pciconfig_write EXTRA pciconfig_write 5 pciconfig_write
diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
index 1c7a20d..6b18e1f 100644
--- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
+++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
@@ -32,8 +32,5 @@ shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair
-getresuid - getresuid i:ppp getresuid
-getresgid - getresgid i:ppp getresgid
-
setrlimit - setrlimit i:ip __setrlimit setrlimit
getrlimit - getrlimit i:ip __getrlimit getrlimit
diff --git a/sysdeps/unix/sysv/linux/i386/getresgid.c b/sysdeps/unix/sysv/linux/i386/getresgid.c
index 235d9d9..9314067 100644
--- a/sysdeps/unix/sysv/linux/i386/getresgid.c
+++ b/sysdeps/unix/sysv/linux/i386/getresgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2002 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
@@ -48,7 +48,7 @@ extern int __libc_missing_32bit_uids;
int
-getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
+__getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
{
# if __ASSUME_32BITUIDS > 0
return INLINE_SYSCALL (getresgid32, 3, CHECK_1 (rgid),
@@ -85,6 +85,9 @@ getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
return result;
# endif
}
+libc_hidden_def (__getresgid)
+weak_alias (__getresgid, getresgid)
+
#else
# include <sysdeps/generic/getresgid.c>
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/getresuid.c b/sysdeps/unix/sysv/linux/i386/getresuid.c
index 30d67f3..8db11f1 100644
--- a/sysdeps/unix/sysv/linux/i386/getresuid.c
+++ b/sysdeps/unix/sysv/linux/i386/getresuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2002 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
@@ -46,7 +46,7 @@ extern int __libc_missing_32bit_uids;
# endif /* __NR_getresuid32 */
int
-getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
+__getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
{
# if __ASSUME_32BITUIDS > 0
return INLINE_SYSCALL (getresuid32, 3, CHECK_1 (ruid),
@@ -83,6 +83,9 @@ getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
return result;
# endif
}
+libc_hidden_def (__getresuid)
+weak_alias (__getresuid, getresuid)
+
#else
# include <sysdeps/generic/getresuid.c>
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/setresgid.c b/sysdeps/unix/sysv/linux/i386/setresgid.c
index 08f9842..264b694 100644
--- a/sysdeps/unix/sysv/linux/i386/setresgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2002 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
@@ -41,10 +41,8 @@ extern int __libc_missing_32bit_uids;
# endif
# endif /* __NR_setresgid32 */
-extern int setresgid (gid_t rgid, gid_t egid, gid_t sgid);
-
int
-setresgid (gid_t rgid, gid_t egid, gid_t sgid)
+__setresgid (gid_t rgid, gid_t egid, gid_t sgid)
{
# if __ASSUME_32BITUIDS > 0
return INLINE_SYSCALL (setresgid32, 3, rgid, egid, sgid);
@@ -75,4 +73,11 @@ setresgid (gid_t rgid, gid_t egid, gid_t sgid)
return INLINE_SYSCALL (setresgid, 3, rgid, egid, sgid);
# endif
}
+libc_hidden_def (__setresgid)
+weak_alias (__setresgid, setresgid)
+
+#else
+
+#include <sysdeps/generic/setresgid.c>
+
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/setresuid.c b/sysdeps/unix/sysv/linux/i386/setresuid.c
index ab4067f..bcfe797 100644
--- a/sysdeps/unix/sysv/linux/i386/setresuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2002 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
@@ -41,8 +41,6 @@ extern int __libc_missing_32bit_uids;
# endif
# endif /* __NR_setresuid32 */
-extern int __setresuid (uid_t ruid, uid_t euid, uid_t suid);
-
int
__setresuid (uid_t ruid, uid_t euid, uid_t suid)
{
@@ -75,5 +73,11 @@ __setresuid (uid_t ruid, uid_t euid, uid_t suid)
return INLINE_SYSCALL (setresuid, 3, ruid, euid, suid);
# endif
}
+libc_hidden_def (__setresuid)
weak_alias (__setresuid, setresuid)
+
+#else
+
+#include <sysdeps/generic/setresuid.c>
+
#endif
diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index c68635f..280b79a 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -57,9 +57,6 @@ pciconfig_write EXTRA pciconfig_write 5 pciconfig_write
ptrace - ptrace 4 __ptrace ptrace
-getresuid - getresuid i:ppp getresuid
-getresgid - getresgid i:ppp getresgid
-
rt_sigaction EXTRA rt_sigaction i:ippi __syscall_rt_sigaction rt_sigaction
rt_sigpending EXTRA rt_sigpending i:pi __syscall_rt_sigpending rt_sigpending
rt_sigprocmask EXTRA rt_sigprocmask i:ippi __syscall_rt_sigprocmask rt_sigprocmask
diff --git a/sysdeps/unix/sysv/linux/mips/syscalls.list b/sysdeps/unix/sysv/linux/mips/syscalls.list
index fe01d76..07e942d 100644
--- a/sysdeps/unix/sysv/linux/mips/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/syscalls.list
@@ -58,8 +58,6 @@ s_getdents getdents getdents i:ipi __syscall_getdents
s_getdents64 getdents getdents64 i:ipi __syscall_getdents64
s_getpmsg getpmsg getpmsg i:ipppp __syscall_getpmsg
s_getpriority getpriority getpriority i:ii __syscall_getpriority
-getresgid - getresgid i:ppp getresgid
-getresuid - getresuid i:ppp getresuid
s_ipc msgget ipc i:iiiip __syscall_ipc
s_lstat64 lxstat64 lstat64 i:sp __syscall_lstat64
s_mmap2 mmap64 mmap2 b:aniiii __syscall_mmap2
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
index 434a9a1..a4adb98 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
@@ -22,8 +22,6 @@ s_getdents getdents getdents i:ipi __syscall_getdents
s_getdents64 getdents getdents64 i:ipi __syscall_getdents64
s_getpmsg getpmsg getpmsg i:ipppp __syscall_getpmsg
s_getpriority getpriority getpriority i:ii __syscall_getpriority
-getresgid - getresgid i:ppp getresgid
-getresuid - getresuid i:ppp getresuid
s_getrlimit getrlimit getrlimit i:ip __syscall_getrlimit
s_lstat64 lxstat64 lstat64 i:sp __syscall_lstat64
s_mmap2 mmap64 mmap2 b:aniiii __syscall_mmap2
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
index fd81f0d..0cd1897 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
@@ -22,8 +22,6 @@ s_getdents getdents getdents i:ipi __syscall_getdents
s_getdents64 getdents getdents64 i:ipi __syscall_getdents64
s_getpmsg getpmsg getpmsg i:ipppp __syscall_getpmsg
s_getpriority getpriority getpriority i:ii __syscall_getpriority
-getresgid - getresgid i:ppp getresgid
-getresuid - getresuid i:ppp getresuid
s_getrlimit getrlimit getrlimit i:ip __syscall_getrlimit
s_lstat64 lxstat64 lstat64 i:sp __syscall_lstat64
s_mmap2 mmap64 mmap2 b:aniiii __syscall_mmap2
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index 191e278..3e595f5 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -44,9 +44,6 @@ shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair
-getresuid - getresuid i:ppp getresuid
-getresgid - getresgid i:ppp getresgid
-
rt_sigaction EXTRA rt_sigaction i:ippi __syscall_rt_sigaction rt_sigaction
rt_sigpending EXTRA rt_sigpending i:pi __syscall_rt_sigpending rt_sigpending
rt_sigprocmask EXTRA rt_sigprocmask i:ippi __syscall_rt_sigprocmask rt_sigprocmask
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
index 6892f58..734b39d 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
@@ -2,10 +2,6 @@ asm-CPPFLAGS = -D__ASSEMBLY__
ASFLAGS-.os += -fPIC
LD += -melf32_sparc
-ifeq ($(subdir),misc)
-sysdep_routines += setfsgid setfsuid
-endif
-
# When I get this to work, this is the right thing
ifeq ($(subdir),elf)
CFLAGS-rtld.c += -mv8
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
index ae34d61..cb4971f 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
@@ -13,10 +13,10 @@ setrlimit - setrlimit 2 __setrlimit setrlimit
getrlimit - getrlimit 2 __getrlimit getrlimit
s_ipc msgget ipc 5 __syscall_ipc
s_setuid setuid setuid 1 __syscall_setuid
-setresuid EXTRA setresuid32 3 __setresuid setresuid
-setresgid EXTRA setresgid32 3 __setresgid setresgid
-getresuid EXTRA getresuid32 3 getresuid
-getresgid EXTRA getresgid32 3 getresgid
+setresuid - setresuid32 3 __setresuid setresuid
+setresgid - setresgid32 3 __setresgid setresgid
+getresuid - getresuid32 3 getresuid
+getresgid - getresgid32 3 getresgid
# System calls with wrappers.
rt_sigaction - rt_sigaction 4 __syscall_rt_sigaction
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
index 2c76ac0..27af9c8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
@@ -32,6 +32,3 @@ sendto - sendto 6 __libc_sendto __sendto sendto
setsockopt - setsockopt 5 __setsockopt setsockopt
shutdown - shutdown 2 __shutdown shutdown
socketpair - socketpair 4 __socketpair socketpair
-
-getresuid - getresuid 3 getresuid
-getresgid - getresgid 3 getresgid
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 5fcc9b5..2cb922e 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -16,6 +16,8 @@ geteuid - geteuid i: __geteuid geteuid
getpgid - getpgid i:i __getpgid getpgid
getpgrp - getpgrp i: getpgrp
getppid - getppid i: __getppid getppid
+getresuid - getresuid i:ppp getresuid
+getresgid - getresgid i:ppp getresgid
getsid - getsid i:i getsid
init_module EXTRA init_module 5 init_module
ioperm - ioperm i:iii ioperm
@@ -56,8 +58,8 @@ sendfile64 - sendfile64 i:iipi sendfile64
setfsgid EXTRA setfsgid i:i setfsgid
setfsuid EXTRA setfsuid i:i setfsuid
setpgid - setpgid i:ii __setpgid setpgid
-setresuid EXTRA setresuid i:iii __setresuid setresuid
-setresgid EXTRA setresgid i:iii __setresgid setresgid
+setresuid - setresuid i:iii __setresuid setresuid
+setresgid - setresgid i:iii __setresgid setresgid
sigaltstack - sigaltstack i:PP __sigaltstack sigaltstack
sysinfo EXTRA sysinfo i:p sysinfo
swapon - swapon i:si __swapon swapon
diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
index 9aea0ef..bec657e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
@@ -8,8 +8,6 @@ pread - pread i:ibni __libc_pread __libc_pread64 __pread pread __pread64 pread
pwrite - pwrite i:ibni __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs __fstatfs64 fstatfs64
statfs - statfs i:sp __statfs statfs statfs64
-getresgid - getresgid i:ppp getresgid
-getresuid - getresuid i:ppp getresuid
getrlimit - getrlimit i:ip __getrlimit getrlimit getrlimit64
setrlimit - setrlimit i:ip __setrlimit setrlimit64 setrlimit
ftruncate - ftruncate i:ii __ftruncate ftruncate ftruncate64 __ftruncate64