Move setfsgid/setfsuid definitions to syscalls.list (bug 14138).

Continuing the move of syscall definitions to syscalls.list, where the removal of support for old kernel versions has made this possible, this patch moves various definitions of setfsgid and setfsuid. Tested for x86. [BZ #14138] * sysdeps/unix/sysv/linux/arm/setfsgid.c: Remove file. * sysdeps/unix/sysv/linux/arm/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/m68k/setfsgid.c: Likewise. * sysdeps/unix/sysv/linux/m68k/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/setfsgid.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/sh/setfsgid.c: Likewise. * sysdeps/unix/sysv/linux/sh/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/setfsgid.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/arm/syscalls.list (setfsgid): Add syscall. (setfsuid): Likewise. * sysdeps/unix/sysv/linux/i386/syscalls.list (setfsgid): Likewise. (setfsuid): Likewise. * sysdeps/unix/sysv/linux/m68k/syscalls.list (setfsgid): Likewise. (setfsuid): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (setfsgid): Likewise. (setfsuid): Likewise. * sysdeps/unix/sysv/linux/sh/syscalls.list (setfsgid): Likewise. (setfsuid): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list (setfsgid): Likewise. (setfsuid): Likewise.
author: Joseph Myers <joseph@codesourcery.com> 2014-10-27 12:24:42 +0000
committer: Joseph Myers <joseph@codesourcery.com> 2014-10-27 12:24:42 +0000
commit: a4b3624d20e90e8255fb82a83ff40e9e178e0aef (patch)
tree: 0db6fe2edbe28b657e41e7f8b7a106453ff2fa64
parent: 3574f2fdf3827d4953d19a89063e517263b5df85 (diff)
download: glibc-a4b3624d20e90e8255fb82a83ff40e9e178e0aef.tar.gz
glibc-a4b3624d20e90e8255fb82a83ff40e9e178e0aef.tar.xz
glibc-a4b3624d20e90e8255fb82a83ff40e9e178e0aef.zip
19 files changed, 49 insertions, 77 deletions
diff --git a/ChangeLog b/ChangeLog
index f97b361d24..151ebcfc71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2014-10-27  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #14138]
+	* sysdeps/unix/sysv/linux/arm/setfsgid.c: Remove file.
+	* sysdeps/unix/sysv/linux/arm/setfsuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setfsuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/m68k/setfsgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/m68k/setfsuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/setfsgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/setfsuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/sh/setfsgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/sh/setfsuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/setfsgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/setfsuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/arm/syscalls.list (setfsgid): Add
+	syscall.
+	(setfsuid): Likewise.
+	* sysdeps/unix/sysv/linux/i386/syscalls.list (setfsgid): Likewise.
+	(setfsuid): Likewise.
+	* sysdeps/unix/sysv/linux/m68k/syscalls.list (setfsgid): Likewise.
+	(setfsuid): Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (setfsgid):
+	Likewise.
+	(setfsuid): Likewise.
+	* sysdeps/unix/sysv/linux/sh/syscalls.list (setfsgid): Likewise.
+	(setfsuid): Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list (setfsgid):
+	Likewise.
+	(setfsuid): Likewise.
+
 2014-10-27  Andreas Schwab  <schwab@suse.de>
 
 	[BZ #17501]
diff --git a/sysdeps/unix/sysv/linux/arm/setfsgid.c b/sysdeps/unix/sysv/linux/arm/setfsgid.c
deleted file mode 100644
index 0886712569..0000000000
--- a/sysdeps/unix/sysv/linux/arm/setfsgid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsgid.c>
diff --git a/sysdeps/unix/sysv/linux/arm/setfsuid.c b/sysdeps/unix/sysv/linux/arm/setfsuid.c
deleted file mode 100644
index a9f22eb8ab..0000000000
--- a/sysdeps/unix/sysv/linux/arm/setfsuid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsuid.c>
diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list
index 15ad91edb9..911ed7d2fa 100644
--- a/sysdeps/unix/sysv/linux/arm/syscalls.list
+++ b/sysdeps/unix/sysv/linux/arm/syscalls.list
@@ -12,6 +12,9 @@ getresgid	-	getresgid32	i:ppp	__getresgid	getresgid
 getresuid	-	getresuid32	i:ppp	__getresuid	getresuid
 getgroups	-	getgroups32	i:ip	__getgroups	getgroups
 
+setfsgid	-	setfsgid32	Ei:i	setfsgid
+setfsuid	-	setfsuid32	Ei:i	setfsuid
+
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 
 fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark
diff --git a/sysdeps/unix/sysv/linux/i386/setfsgid.c b/sysdeps/unix/sysv/linux/i386/setfsgid.c
deleted file mode 100644
index 880f7544af..0000000000
--- a/sysdeps/unix/sysv/linux/i386/setfsgid.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 1998-2014 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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/fsuid.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-#include <linux/posix_types.h>
-
-/* Consider moving to syscalls.list.  */
-
-int
-setfsgid (gid_t gid)
-{
-  INTERNAL_SYSCALL_DECL (err);
-  return INTERNAL_SYSCALL (setfsgid32, err, 1, gid);
-}
diff --git a/sysdeps/unix/sysv/linux/i386/setfsuid.c b/sysdeps/unix/sysv/linux/i386/setfsuid.c
deleted file mode 100644
index 1fd330cd0c..0000000000
--- a/sysdeps/unix/sysv/linux/i386/setfsuid.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1998-2014 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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/fsuid.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <linux/posix_types.h>
-
-/* Consider moving to syscalls.list.  */
-
-int
-setfsuid (uid_t uid)
-{
-  INTERNAL_SYSCALL_DECL (err);
-  return INTERNAL_SYSCALL (setfsuid32, err, 1, uid);
-}
diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
index f487c67de5..901501a7aa 100644
--- a/sysdeps/unix/sysv/linux/i386/syscalls.list
+++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
@@ -12,6 +12,9 @@ getresgid	-	getresgid32	i:ppp	__getresgid	getresgid
 getresuid	-	getresuid32	i:ppp	__getresuid	getresuid
 getgroups	-	getgroups32	i:ip	__getgroups	getgroups
 
+setfsgid	-	setfsgid32	Ei:i	setfsgid
+setfsuid	-	setfsuid32	Ei:i	setfsuid
+
 modify_ldt	EXTRA	modify_ldt	i:ipi	__modify_ldt	modify_ldt
 vm86old		EXTRA	vm86old		i:p	__vm86old	vm86@GLIBC_2.0
 vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2.3.4
diff --git a/sysdeps/unix/sysv/linux/m68k/setfsgid.c b/sysdeps/unix/sysv/linux/m68k/setfsgid.c
deleted file mode 100644
index 0886712569..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/setfsgid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsgid.c>
diff --git a/sysdeps/unix/sysv/linux/m68k/setfsuid.c b/sysdeps/unix/sysv/linux/m68k/setfsuid.c
deleted file mode 100644
index a9f22eb8ab..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/setfsuid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsuid.c>
diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list
index fec801dc70..6ebca162c1 100644
--- a/sysdeps/unix/sysv/linux/m68k/syscalls.list
+++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list
@@ -13,6 +13,9 @@ getresgid	-	getresgid32	i:ppp	__getresgid	getresgid
 getresuid	-	getresuid32	i:ppp	__getresuid	getresuid
 getgroups	-	getgroups32	i:ip	__getgroups	getgroups
 
+setfsgid	-	setfsgid32	Ei:i	setfsgid
+setfsuid	-	setfsuid32	Ei:i	setfsuid
+
 cacheflush	EXTRA	cacheflush	i:iiii	__cacheflush	cacheflush
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/setfsgid.c b/sysdeps/unix/sysv/linux/s390/s390-32/setfsgid.c
deleted file mode 100644
index 0886712569..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-32/setfsgid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsgid.c>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/setfsuid.c b/sysdeps/unix/sysv/linux/s390/s390-32/setfsuid.c
deleted file mode 100644
index a9f22eb8ab..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-32/setfsuid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsuid.c>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
index 2f795b693e..82baf9cf36 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
@@ -12,6 +12,9 @@ getresgid	-	getresgid32	i:ppp	__getresgid	getresgid
 getresuid	-	getresuid32	i:ppp	__getresuid	getresuid
 getgroups	-	getgroups32	i:ip	__getgroups	getgroups
 
+setfsgid	-	setfsgid32	Ei:i	setfsgid
+setfsuid	-	setfsuid32	Ei:i	setfsuid
+
 oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
 setrlimit	-	setrlimit	i:ip	__setrlimit	setrlimit@GLIBC_2.0 setrlimit@@GLIBC_2.2
 
diff --git a/sysdeps/unix/sysv/linux/sh/setfsgid.c b/sysdeps/unix/sysv/linux/sh/setfsgid.c
deleted file mode 100644
index 0886712569..0000000000
--- a/sysdeps/unix/sysv/linux/sh/setfsgid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsgid.c>
diff --git a/sysdeps/unix/sysv/linux/sh/setfsuid.c b/sysdeps/unix/sysv/linux/sh/setfsuid.c
deleted file mode 100644
index a9f22eb8ab..0000000000
--- a/sysdeps/unix/sysv/linux/sh/setfsuid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsuid.c>
diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list
index 2c010c8281..5fd7c9a42f 100644
--- a/sysdeps/unix/sysv/linux/sh/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sh/syscalls.list
@@ -12,6 +12,9 @@ getresgid	-	getresgid32	i:ppp	__getresgid	getresgid
 getresuid	-	getresuid32	i:ppp	__getresuid	getresuid
 getgroups	-	getgroups32	i:ip	__getgroups	getgroups
 
+setfsgid	-	setfsgid32	Ei:i	setfsgid
+setfsuid	-	setfsuid32	Ei:i	setfsuid
+
 waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid
 
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/setfsgid.c b/sysdeps/unix/sysv/linux/sparc/sparc32/setfsgid.c
deleted file mode 100644
index 0886712569..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/setfsgid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsgid.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/setfsuid.c b/sysdeps/unix/sysv/linux/sparc/sparc32/setfsuid.c
deleted file mode 100644
index a9f22eb8ab..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/setfsuid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/setfsuid.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
index b52616dfa7..6240cd3a52 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
@@ -14,5 +14,8 @@ getresuid	-	getresuid32	3	getresuid
 getresgid	-	getresgid32	3	getresgid
 getgroups	-	getgroups32	i:ip	__getgroups	getgroups
 
+setfsgid	-	setfsgid32	Ei:i	setfsgid
+setfsuid	-	setfsuid32	Ei:i	setfsuid
+
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark
author	Joseph Myers <joseph@codesourcery.com>	2014-10-27 12:24:42 +0000
committer	Joseph Myers <joseph@codesourcery.com>	2014-10-27 12:24:42 +0000
commit	a4b3624d20e90e8255fb82a83ff40e9e178e0aef (patch)
tree	0db6fe2edbe28b657e41e7f8b7a106453ff2fa64
parent	3574f2fdf3827d4953d19a89063e517263b5df85 (diff)
download	glibc-a4b3624d20e90e8255fb82a83ff40e9e178e0aef.tar.gz glibc-a4b3624d20e90e8255fb82a83ff40e9e178e0aef.tar.xz glibc-a4b3624d20e90e8255fb82a83ff40e9e178e0aef.zip