aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-11-12 01:15:06 +0000
committerUlrich Drepper <drepper@redhat.com>2004-11-12 01:15:06 +0000
commit85bd63313720ed5e7f10427ec5f0d2f59ee23614 (patch)
treec370d07825bc9f517c39de279a4b92650ad4c836
parent29311370cd23623cc227a67c54ae3bdd0f7d7058 (diff)
downloadglibc-85bd63313720ed5e7f10427ec5f0d2f59ee23614.tar
glibc-85bd63313720ed5e7f10427ec5f0d2f59ee23614.tar.gz
glibc-85bd63313720ed5e7f10427ec5f0d2f59ee23614.tar.bz2
glibc-85bd63313720ed5e7f10427ec5f0d2f59ee23614.zip
Remove sys/syscall.h, sys/types.h, linux/posix_types.h, sysdep.h and pthread-functions.h includes. Include setxid.h. Use INLINE_SETXID_SYSCALL macro instead of INLINE_SYSCALL, kill the HAVE_PTR__NPTL_SETXID guarded snippets.
-rw-r--r--sysdeps/unix/sysv/linux/alpha/setregid.c26
-rw-r--r--sysdeps/unix/sysv/linux/alpha/setresgid.c28
-rw-r--r--sysdeps/unix/sysv/linux/alpha/setresuid.c28
-rw-r--r--sysdeps/unix/sysv/linux/alpha/setreuid.c26
-rw-r--r--sysdeps/unix/sysv/linux/i386/setegid.c19
-rw-r--r--sysdeps/unix/sysv/linux/i386/seteuid.c19
-rw-r--r--sysdeps/unix/sysv/linux/i386/setgid.c28
-rw-r--r--sysdeps/unix/sysv/linux/i386/setregid.c25
-rw-r--r--sysdeps/unix/sysv/linux/i386/setresgid.c26
-rw-r--r--sysdeps/unix/sysv/linux/i386/setresuid.c26
-rw-r--r--sysdeps/unix/sysv/linux/i386/setreuid.c25
-rw-r--r--sysdeps/unix/sysv/linux/i386/setuid.c24
-rw-r--r--sysdeps/unix/sysv/linux/setegid.c26
-rw-r--r--sysdeps/unix/sysv/linux/seteuid.c26
-rw-r--r--sysdeps/unix/sysv/linux/setgid.c26
-rw-r--r--sysdeps/unix/sysv/linux/setregid.c26
-rw-r--r--sysdeps/unix/sysv/linux/setresgid.c28
-rw-r--r--sysdeps/unix/sysv/linux/setresuid.c28
-rw-r--r--sysdeps/unix/sysv/linux/setreuid.c26
-rw-r--r--sysdeps/unix/sysv/linux/setuid.c26
20 files changed, 59 insertions, 453 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/setregid.c b/sysdeps/unix/sysv/linux/alpha/setregid.c
index cfc8283c3a..0973fe4ac1 100644
--- a/sysdeps/unix/sysv/linux/alpha/setregid.c
+++ b/sysdeps/unix/sysv/linux/alpha/setregid.c
@@ -18,35 +18,13 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setregid (gid_t rgid, gid_t egid)
{
- int result;
-
- result = INLINE_SYSCALL (setregid, 2, (signed int)rgid, (signed int)egid);
-
-#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_setregid;
- cmd.id[0] = rgid;
- cmd.id[1] = egid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setregid, 2, (int) rgid, (int) egid);
}
#ifndef __setregid
weak_alias (__setregid, setregid)
diff --git a/sysdeps/unix/sysv/linux/alpha/setresgid.c b/sysdeps/unix/sysv/linux/alpha/setresgid.c
index fdfa486534..50e29e3c76 100644
--- a/sysdeps/unix/sysv/linux/alpha/setresgid.c
+++ b/sysdeps/unix/sysv/linux/alpha/setresgid.c
@@ -18,36 +18,14 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setresgid (gid_t rgid, gid_t egid, gid_t sgid)
{
- int result;
-
- result = INLINE_SYSCALL (setresgid, 3, (signed int)rgid, (signed int)egid, (signed int)sgid);
-
-#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_setresgid;
- cmd.id[0] = rgid;
- cmd.id[1] = egid;
- cmd.id[2] = sgid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setresgid, 3, (int) rgid,
+ (int) egid, (int) sgid);
}
libc_hidden_def (__setresgid)
#ifndef __setresgid
diff --git a/sysdeps/unix/sysv/linux/alpha/setresuid.c b/sysdeps/unix/sysv/linux/alpha/setresuid.c
index 49671278ee..e76413bf6a 100644
--- a/sysdeps/unix/sysv/linux/alpha/setresuid.c
+++ b/sysdeps/unix/sysv/linux/alpha/setresuid.c
@@ -18,36 +18,14 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setresuid (uid_t ruid, uid_t euid, uid_t suid)
{
- int result;
-
- result = INLINE_SYSCALL (setresuid, 3, (signed int)ruid, (signed int)euid, (signed int)suid);
-
-#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_setresuid;
- cmd.id[0] = ruid;
- cmd.id[1] = euid;
- cmd.id[2] = suid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setresuid, 3, (int) ruid,
+ (int) euid, (int) suid);
}
libc_hidden_def (__setresuid)
#ifndef __setresuid
diff --git a/sysdeps/unix/sysv/linux/alpha/setreuid.c b/sysdeps/unix/sysv/linux/alpha/setreuid.c
index b29aed479e..a23a34792e 100644
--- a/sysdeps/unix/sysv/linux/alpha/setreuid.c
+++ b/sysdeps/unix/sysv/linux/alpha/setreuid.c
@@ -18,35 +18,13 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setreuid (uid_t ruid, uid_t euid)
{
- int result;
-
- result = INLINE_SYSCALL (setreuid, 2, (signed int)ruid, (signed int)euid);
-
-#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_setreuid;
- cmd.id[0] = ruid;
- cmd.id[1] = euid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setreuid, 2, (int) ruid, (int) euid);
}
#ifndef __setreuid
weak_alias (__setreuid, setreuid)
diff --git a/sysdeps/unix/sysv/linux/i386/setegid.c b/sysdeps/unix/sysv/linux/i386/setegid.c
index b8682e3681..b4bf33f18f 100644
--- a/sysdeps/unix/sysv/linux/i386/setegid.c
+++ b/sysdeps/unix/sysv/linux/i386/setegid.c
@@ -18,11 +18,8 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#ifdef __NR_setresgid
@@ -42,7 +39,7 @@ setegid (gid)
}
#if __ASSUME_32BITUIDS > 0
- result = INLINE_SYSCALL (setresgid32, 3, -1, gid, -1);
+ result = INLINE_SETXID_SYSCALL (setresgid32, 3, -1, gid, -1);
#else
/* First try the syscall. */
# ifdef __NR_setresgid
@@ -59,18 +56,6 @@ setegid (gid)
result = __setregid (-1, gid);
#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_setresgid32;
- cmd.id[0] = -1;
- cmd.id[1] = gid;
- cmd.id[2] = -1;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
libc_hidden_def (setegid)
diff --git a/sysdeps/unix/sysv/linux/i386/seteuid.c b/sysdeps/unix/sysv/linux/i386/seteuid.c
index 0abdac832f..c139684d04 100644
--- a/sysdeps/unix/sysv/linux/i386/seteuid.c
+++ b/sysdeps/unix/sysv/linux/i386/seteuid.c
@@ -17,12 +17,9 @@
02111-1307 USA. */
#include <errno.h>
-#include <sys/types.h>
#include <unistd.h>
-
-#include <sysdep.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#ifdef __NR_setresuid
@@ -41,7 +38,7 @@ seteuid (uid_t uid)
}
#if __ASSUME_32BITUIDS > 0
- result = INLINE_SYSCALL (setresuid32, 3, -1, uid, -1);
+ result = INLINE_SETXID_SYSCALL (setresuid32, 3, -1, uid, -1);
#else
/* First try the syscall. */
# ifdef __NR_setresuid
@@ -58,18 +55,6 @@ seteuid (uid_t uid)
result = __setreuid (-1, uid);
#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_setresuid32;
- cmd.id[0] = -1;
- cmd.id[1] = uid;
- cmd.id[2] = -1;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
libc_hidden_def (seteuid)
diff --git a/sysdeps/unix/sysv/linux/i386/setgid.c b/sysdeps/unix/sysv/linux/i386/setgid.c
index 17bfc3e58a..19b1e9f500 100644
--- a/sysdeps/unix/sysv/linux/i386/setgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setgid.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1998, 2000, 2003, 2004
- 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
@@ -19,15 +18,8 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#ifdef __NR_setgid32
@@ -44,14 +36,14 @@ __setgid (gid_t gid)
int result;
#if __ASSUME_32BITUIDS > 0
- result = INLINE_SYSCALL (setgid32, 1, gid);
+ result = INLINE_SETXID_SYSCALL (setgid32, 1, gid);
#else
# ifdef __NR_setgid32
if (__libc_missing_32bit_uids <= 0)
{
int saved_errno = errno;
- result = INLINE_SYSCALL (setgid32, 1, gid);
+ result = INLINE_SETXID_SYSCALL (setgid32, 1, gid);
if (result == 0)
goto out;
@@ -70,22 +62,12 @@ __setgid (gid_t gid)
return -1;
}
- result = INLINE_SYSCALL (setgid, 1, gid);
+ result = INLINE_SETXID_SYSCALL (setgid, 1, gid);
# ifdef __NR_setgid32
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_setgid32;
- cmd.id[0] = gid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
#ifndef __setgid
diff --git a/sysdeps/unix/sysv/linux/i386/setregid.c b/sysdeps/unix/sysv/linux/i386/setregid.c
index f883497fae..be7870d3b7 100644
--- a/sysdeps/unix/sysv/linux/i386/setregid.c
+++ b/sysdeps/unix/sysv/linux/i386/setregid.c
@@ -17,15 +17,9 @@
02111-1307 USA. */
#include <errno.h>
-#include <sys/types.h>
#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#ifdef __NR_setregid32
@@ -42,14 +36,14 @@ __setregid (gid_t rgid, gid_t egid)
int result;
#if __ASSUME_32BITUIDS > 0
- result = INLINE_SYSCALL (setregid32, 2, rgid, egid);
+ result = INLINE_SETXID_SYSCALL (setregid32, 2, rgid, egid);
#else
# ifdef __NR_setregid32
if (__libc_missing_32bit_uids <= 0)
{
int saved_errno = errno;
- result = INLINE_SYSCALL (setregid32, 2, rgid, egid);
+ result = INLINE_SETXID_SYSCALL (setregid32, 2, rgid, egid);
if (result == 0)
goto out;
@@ -67,23 +61,12 @@ __setregid (gid_t rgid, gid_t egid)
return -1;
}
- result = INLINE_SYSCALL (setregid, 2, rgid, egid);
+ result = INLINE_SETXID_SYSCALL (setregid, 2, rgid, egid);
# ifdef __NR_setregid32
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_setregid32;
- cmd.id[0] = rgid;
- cmd.id[1] = egid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
#ifndef __setregid
diff --git a/sysdeps/unix/sysv/linux/i386/setresgid.c b/sysdeps/unix/sysv/linux/i386/setresgid.c
index 614e2c256d..c8b17ee7fc 100644
--- a/sysdeps/unix/sysv/linux/i386/setresgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresgid.c
@@ -18,14 +18,8 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <linux/posix_types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#if defined __NR_setresgid || defined __NR_setresgid32
@@ -44,14 +38,14 @@ __setresgid (gid_t rgid, gid_t egid, gid_t sgid)
int result;
# if __ASSUME_32BITUIDS > 0 || !defined __NR_setresgid
- result = INLINE_SYSCALL (setresgid32, 3, rgid, egid, sgid);
+ result = INLINE_SETXID_SYSCALL (setresgid32, 3, rgid, egid, sgid);
# else
# ifdef __NR_setresgid32
if (__libc_missing_32bit_uids <= 0)
{
int saved_errno = errno;
- result = INLINE_SYSCALL (setresgid32, 3, rgid, egid, sgid);
+ result = INLINE_SETXID_SYSCALL (setresgid32, 3, rgid, egid, sgid);
if (result == 0)
goto out;
if (errno != ENOSYS)
@@ -70,24 +64,12 @@ __setresgid (gid_t rgid, gid_t egid, gid_t sgid)
return -1;
}
- result = INLINE_SYSCALL (setresgid, 3, rgid, egid, sgid);
+ result = INLINE_SETXID_SYSCALL (setresgid, 3, rgid, egid, sgid);
# ifdef __NR_setresgid32
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_setresgid32;
- cmd.id[0] = rgid;
- cmd.id[1] = egid;
- cmd.id[2] = sgid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
libc_hidden_def (__setresgid)
diff --git a/sysdeps/unix/sysv/linux/i386/setresuid.c b/sysdeps/unix/sysv/linux/i386/setresuid.c
index 4d735ca0f9..a91896a1a4 100644
--- a/sysdeps/unix/sysv/linux/i386/setresuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresuid.c
@@ -18,14 +18,8 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <linux/posix_types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#if defined __NR_setresuid || defined __NR_setresuid32
@@ -44,14 +38,14 @@ __setresuid (uid_t ruid, uid_t euid, uid_t suid)
int result;
# if __ASSUME_32BITUIDS > 0 || !defined __NR_setresuid
- result = INLINE_SYSCALL (setresuid32, 3, ruid, euid, suid);
+ result = INLINE_SETXID_SYSCALL (setresuid32, 3, ruid, euid, suid);
# else
# ifdef __NR_setresuid32
if (__libc_missing_32bit_uids <= 0)
{
int saved_errno = errno;
- result = INLINE_SYSCALL (setresuid32, 3, ruid, euid, suid);
+ result = INLINE_SETXID_SYSCALL (setresuid32, 3, ruid, euid, suid);
if (result == 0)
goto out;
if (errno != ENOSYS)
@@ -70,24 +64,12 @@ __setresuid (uid_t ruid, uid_t euid, uid_t suid)
return -1;
}
- result = INLINE_SYSCALL (setresuid, 3, ruid, euid, suid);
+ result = INLINE_SETXID_SYSCALL (setresuid, 3, ruid, euid, suid);
# ifdef __NR_setresuid32
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_setresuid32;
- cmd.id[0] = ruid;
- cmd.id[1] = euid;
- cmd.id[2] = suid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
libc_hidden_def (__setresuid)
diff --git a/sysdeps/unix/sysv/linux/i386/setreuid.c b/sysdeps/unix/sysv/linux/i386/setreuid.c
index 1e1bfcf0d4..55dae1ebab 100644
--- a/sysdeps/unix/sysv/linux/i386/setreuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setreuid.c
@@ -17,15 +17,9 @@
02111-1307 USA. */
#include <errno.h>
-#include <sys/types.h>
#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#ifdef __NR_setreuid32
@@ -42,14 +36,14 @@ __setreuid (uid_t ruid, uid_t euid)
int result;
#if __ASSUME_32BITUIDS > 0
- result = INLINE_SYSCALL (setreuid32, 2, ruid, euid);
+ result = INLINE_SETXID_SYSCALL (setreuid32, 2, ruid, euid);
#else
# ifdef __NR_setreuid32
if (__libc_missing_32bit_uids <= 0)
{
int saved_errno = errno;
- result = INLINE_SYSCALL (setreuid32, 2, ruid, euid);
+ result = INLINE_SETXID_SYSCALL (setreuid32, 2, ruid, euid);
if (result == 0)
goto out;
@@ -67,23 +61,12 @@ __setreuid (uid_t ruid, uid_t euid)
return -1;
}
- result = INLINE_SYSCALL (setreuid, 2, ruid, euid);
+ result = INLINE_SETXID_SYSCALL (setreuid, 2, ruid, euid);
# ifdef __NR_setreuid32
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_setreuid32;
- cmd.id[0] = ruid;
- cmd.id[1] = euid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
#ifndef __setreuid
diff --git a/sysdeps/unix/sysv/linux/i386/setuid.c b/sysdeps/unix/sysv/linux/i386/setuid.c
index 0d948fb775..9ebf76267f 100644
--- a/sysdeps/unix/sysv/linux/i386/setuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setuid.c
@@ -18,14 +18,8 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#ifdef __NR_setuid32
@@ -42,14 +36,14 @@ __setuid (uid_t uid)
int result;
#if __ASSUME_32BITUIDS > 0 && defined __NR_setuid32
- result = INLINE_SYSCALL (setuid32, 1, uid);
+ result = INLINE_SETXID_SYSCALL (setuid32, 1, uid);
#else
# ifdef __NR_setuid32
if (__libc_missing_32bit_uids <= 0)
{
int saved_errno = errno;
- result = INLINE_SYSCALL (setuid32, 1, uid);
+ result = INLINE_SETXID_SYSCALL (setuid32, 1, uid);
if (result == 0)
goto out;
if (errno != ENOSYS)
@@ -67,22 +61,12 @@ __setuid (uid_t uid)
return -1;
}
- result = INLINE_SYSCALL (setuid, 1, uid);
+ result = INLINE_SETXID_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
diff --git a/sysdeps/unix/sysv/linux/setegid.c b/sysdeps/unix/sysv/linux/setegid.c
index 33e91c773a..f87af0d16f 100644
--- a/sysdeps/unix/sysv/linux/setegid.c
+++ b/sysdeps/unix/sysv/linux/setegid.c
@@ -17,13 +17,9 @@
02111-1307 USA. */
#include <errno.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
#include <unistd.h>
-
-#include <sysdep.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#if defined __NR_setresgid || __ASSUME_SETRESGID_SYSCALL > 0
@@ -42,10 +38,10 @@ setegid (gid_t gid)
}
# if __ASSUME_32BITUIDS > 0 && defined __NR_setresgid32
- result = INLINE_SYSCALL (setresgid32, 3, -1, gid, -1);
+ result = INLINE_SETXID_SYSCALL (setresgid32, 3, -1, gid, -1);
# else
/* First try the syscall. */
- result = INLINE_SYSCALL (setresgid, 3, -1, gid, -1);
+ result = INLINE_SETXID_SYSCALL (setresgid, 3, -1, gid, -1);
# if __ASSUME_SETRESGID_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use emulation. This may not work
@@ -55,22 +51,6 @@ setegid (gid_t gid)
# 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;
-# ifdef __NR_setresgid32
- cmd.syscall_no = __NR_setresgid32;
-# else
- cmd.syscall_no = __NR_setresgid;
-# endif
- cmd.id[0] = -1;
- cmd.id[1] = gid;
- cmd.id[2] = -1;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
#ifndef setegid
diff --git a/sysdeps/unix/sysv/linux/seteuid.c b/sysdeps/unix/sysv/linux/seteuid.c
index da03a1e6ef..5e5d1e184f 100644
--- a/sysdeps/unix/sysv/linux/seteuid.c
+++ b/sysdeps/unix/sysv/linux/seteuid.c
@@ -17,13 +17,9 @@
02111-1307 USA. */
#include <errno.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
#include <unistd.h>
-
-#include <sysdep.h>
+#include <setxid.h>
#include "kernel-features.h"
-#include <pthread-functions.h>
#if defined __NR_setresuid || __ASSUME_SETRESUID_SYSCALL > 0
@@ -42,10 +38,10 @@ seteuid (uid_t uid)
}
# if __ASSUME_32BITUIDS > 0 && defined __NR_setresuid32
- result = INLINE_SYSCALL (setresuid32, 3, -1, uid, -1);
+ result = INLINE_SETXID_SYSCALL (setresuid32, 3, -1, uid, -1);
# else
/* First try the syscall. */
- result = INLINE_SYSCALL (setresuid, 3, -1, uid, -1);
+ result = INLINE_SETXID_SYSCALL (setresuid, 3, -1, uid, -1);
# if __ASSUME_SETRESUID_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use emulation. This may not work
@@ -55,22 +51,6 @@ seteuid (uid_t uid)
# 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;
-# ifdef __NR_setresuid32
- cmd.syscall_no = __NR_setresuid32;
-# else
- cmd.syscall_no = __NR_setresuid;
-# endif
- cmd.id[0] = -1;
- cmd.id[1] = uid;
- cmd.id[2] = -1;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
return result;
}
#ifndef seteuid
diff --git a/sysdeps/unix/sysv/linux/setgid.c b/sysdeps/unix/sysv/linux/setgid.c
index dae642abb5..1411f53659 100644
--- a/sysdeps/unix/sysv/linux/setgid.c
+++ b/sysdeps/unix/sysv/linux/setgid.c
@@ -18,35 +18,13 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
-
+#include <setxid.h>
int
__setgid (gid_t gid)
{
- int result;
-
- result = INLINE_SYSCALL (setgid, 1, gid);
-
-#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_setgid;
- cmd.id[0] = gid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setgid, 1, gid);
}
#ifndef __setgid
weak_alias (__setgid, setgid)
diff --git a/sysdeps/unix/sysv/linux/setregid.c b/sysdeps/unix/sysv/linux/setregid.c
index 1d539260ed..df79eae913 100644
--- a/sysdeps/unix/sysv/linux/setregid.c
+++ b/sysdeps/unix/sysv/linux/setregid.c
@@ -18,35 +18,13 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setregid (gid_t rgid, gid_t egid)
{
- int result;
-
- result = INLINE_SYSCALL (setregid, 2, rgid, egid);
-
-#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_setregid;
- cmd.id[0] = rgid;
- cmd.id[1] = egid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setregid, 2, rgid, egid);
}
#ifndef __setregid
weak_alias (__setregid, setregid)
diff --git a/sysdeps/unix/sysv/linux/setresgid.c b/sysdeps/unix/sysv/linux/setresgid.c
index ae61d42e6b..d6c9758d71 100644
--- a/sysdeps/unix/sysv/linux/setresgid.c
+++ b/sysdeps/unix/sysv/linux/setresgid.c
@@ -18,37 +18,15 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setresgid (gid_t rgid, gid_t egid, gid_t sgid)
{
- int result;
-
- result = INLINE_SYSCALL (setresgid, 3, rgid, egid, sgid);
-
-#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_setresgid;
- cmd.id[0] = rgid;
- cmd.id[1] = egid;
- cmd.id[2] = sgid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setresgid, 3, rgid, egid, sgid);
}
+libc_hidden_def (__setresgid)
#ifndef __setresgid
weak_alias (__setresgid, setresgid)
#endif
diff --git a/sysdeps/unix/sysv/linux/setresuid.c b/sysdeps/unix/sysv/linux/setresuid.c
index 962d944aa4..e7feeefce0 100644
--- a/sysdeps/unix/sysv/linux/setresuid.c
+++ b/sysdeps/unix/sysv/linux/setresuid.c
@@ -18,37 +18,15 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setresuid (uid_t ruid, uid_t euid, uid_t suid)
{
- int result;
-
- result = INLINE_SYSCALL (setresuid, 3, ruid, euid, suid);
-
-#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_setresuid;
- cmd.id[0] = ruid;
- cmd.id[1] = euid;
- cmd.id[2] = suid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setresuid, 3, ruid, euid, suid);
}
+libc_hidden_def (__setresuid)
#ifndef __setresuid
weak_alias (__setresuid, setresuid)
#endif
diff --git a/sysdeps/unix/sysv/linux/setreuid.c b/sysdeps/unix/sysv/linux/setreuid.c
index c9d841eca0..ce30d3c696 100644
--- a/sysdeps/unix/sysv/linux/setreuid.c
+++ b/sysdeps/unix/sysv/linux/setreuid.c
@@ -18,35 +18,13 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
+#include <setxid.h>
int
__setreuid (uid_t ruid, uid_t euid)
{
- int result;
-
- result = INLINE_SYSCALL (setreuid, 2, ruid, euid);
-
-#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_setreuid;
- cmd.id[0] = ruid;
- cmd.id[1] = euid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setreuid, 2, ruid, euid);
}
#ifndef __setreuid
weak_alias (__setreuid, setreuid)
diff --git a/sysdeps/unix/sysv/linux/setuid.c b/sysdeps/unix/sysv/linux/setuid.c
index 84f35176a1..a523dfdbd2 100644
--- a/sysdeps/unix/sysv/linux/setuid.c
+++ b/sysdeps/unix/sysv/linux/setuid.c
@@ -18,34 +18,12 @@
#include <errno.h>
#include <unistd.h>
-#include <sys/types.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-#include "kernel-features.h"
-#include <pthread-functions.h>
-
+#include <setxid.h>
int
__setuid (uid_t uid)
{
- int result;
-
- result = INLINE_SYSCALL (setuid, 1, uid);
-
-#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_setuid;
- cmd.id[0] = uid;
- __libc_pthread_functions.ptr__nptl_setxid (&cmd);
- }
-#endif
-
- return result;
+ return INLINE_SETXID_SYSCALL (setuid, 1, uid);
}
#ifndef __setuid
weak_alias (__setuid, setuid)