diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-07-01 16:36:17 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-07-01 16:36:17 +0000 |
| commit | 00b576547255def8e189e05e991fb74edcef3897 (patch) | |
| tree | f7765ec00f395dcaccc8907a208c7d5e31cc627a /x11-base/xorg-server | |
| parent | Keyworded ~amd64 (diff) | |
| download | gentoo-2-00b576547255def8e189e05e991fb74edcef3897.tar.gz gentoo-2-00b576547255def8e189e05e991fb74edcef3897.tar.bz2 gentoo-2-00b576547255def8e189e05e991fb74edcef3897.zip | |
Fix the setuid patches. (Thanks to Rudo Thomas for the catch in bug #138688)
(Portage version: 2.1.1_pre1-r5)
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/x11r7.0-setuid.diff | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 7310f5ea25f6..9a4187fea3aa 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.139 2006/07/01 01:08:57 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.140 2006/07/01 16:36:17 joshuabaergen Exp $ + + 01 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org> + files/x11r7.0-setuid.diff, files/xorg-server-1.1.0-setuid.diff: + Fix the setuid patches. (Thanks to Rudo Thomas for the catch in bug #138688) 01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>; xorg-server-1.1.0-r1.ebuild: diff --git a/x11-base/xorg-server/files/x11r7.0-setuid.diff b/x11-base/xorg-server/files/x11r7.0-setuid.diff index 20a6786ce6c3..4d813539d030 100644 --- a/x11-base/xorg-server/files/x11r7.0-setuid.diff +++ b/x11-base/xorg-server/files/x11r7.0-setuid.diff @@ -49,7 +49,7 @@ diff -u -u -r1.3 write.c return 0; case 0: /* child */ - setuid(getuid()); -+ if (setuid(getuid() == -1) ++ if (setuid(getuid()) == -1) + FatalError("xf86writeConfigFile(): " + "setuid failed(%s)\n", + strerror(errno)); diff --git a/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff b/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff index a419c59d925e..96d2d0a3225a 100644 --- a/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff +++ b/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff @@ -49,7 +49,7 @@ diff -u -u -r1.3 write.c return 0; case 0: /* child */ - setuid(getuid()); -+ if (setuid(getuid() == -1) ++ if (setuid(getuid()) == -1) + FatalError("xf86writeConfigFile(): " + "setuid failed(%s)\n", + strerror(errno)); |