The required Linux specific implementation is moved to internal
posix_spawn implementation.
No semantic changes expected.
---
sysdeps/generic/local-setxid.h | 4 ----
sysdeps/posix/spawni.c | 5 ++---
sysdeps/unix/sysv/linux/local-setxid.h | 16 ----------------
sysdeps/unix/sysv/linux/spawni.c | 19 ++++++++++++++++++-
4 files changed, 20 insertions(+), 24 deletions(-)
delete mode 100644 sysdeps/generic/local-setxid.h
delete mode 100644 sysdeps/unix/sysv/linux/local-setxid.h
deleted file mode 100644
@@ -1,4 +0,0 @@
-/* No special support. Fall back to the regular functions. */
-
-#define local_seteuid(id) seteuid (id)
-#define local_setegid(id) setegid (id)
@@ -26,7 +26,6 @@
#include <sys/param.h>
#include <sys/mman.h>
#include <not-cancel.h>
-#include <local-setxid.h>
#include <shlib-compat.h>
#include <nptl/pthreadP.h>
#include <dl-sysdep.h>
@@ -139,8 +138,8 @@ __spawni_child (void *arguments)
/* Set the effective user and group IDs. */
if ((attr->__flags & POSIX_SPAWN_RESETIDS) != 0
- && (local_seteuid (__getuid ()) != 0
- || local_setegid (__getgid ())) != 0)
+ && (__seteuid (__getuid ()) != 0
+ || __setegid (__getgid ())) != 0)
goto fail;
/* Execute the file actions. */
deleted file mode 100644
@@ -1,16 +0,0 @@
-/* SETxID functions which only have to change the local thread and
- none of the possible other threads. */
-#include <sysdep.h>
-
-#ifdef __NR_setresuid32
-# define local_seteuid(id) INLINE_SYSCALL (setresuid32, 3, -1, id, -1)
-#else
-# define local_seteuid(id) INLINE_SYSCALL (setresuid, 3, -1, id, -1)
-#endif
-
-
-#ifdef __NR_setresgid32
-# define local_setegid(id) INLINE_SYSCALL (setresgid32, 3, -1, id, -1)
-#else
-# define local_setegid(id) INLINE_SYSCALL (setresgid, 3, -1, id, -1)
-#endif
@@ -25,7 +25,6 @@
#include <sys/param.h>
#include <sys/mman.h>
#include <not-cancel.h>
-#include <local-setxid.h>
#include <shlib-compat.h>
#include <nptl/pthreadP.h>
#include <dl-sysdep.h>
@@ -74,6 +73,24 @@
# define STACK(__stack, __stack_size) (__stack + __stack_size)
#endif
+/* SETxID functions which only have to change the local thread and none of the
+ possible other threads. */
+static int local_seteuid (uid_t euid)
+{
+#ifndef __NR_setresuid32
+# define __NR_setresuid32 __NR_setresuid
+#endif
+ return INLINE_SYSCALL_CALL (setresuid32, -1, euid, -1);
+}
+
+static int local_setegid (uid_t egid)
+{
+#ifndef __NR_setresgid32
+# define __NR_setresgid32 __NR_setresgid
+#endif
+ return INLINE_SYSCALL_CALL (setresgid32, -1, egid, -1);
+}
+
struct posix_spawn_args
{