rpms/xorg-x11-server/FC-5 xorg-server-1.0.1-CVE-2006-0745.patch, NONE, 1.1 xorg-x11-server.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28889

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-server-1.0.1-CVE-2006-0745.patch 
Log Message:
Move old embargo branch stuff over to FC-5 updates branch
(CVE-2006-0745 (bug 185084))


xorg-server-1.0.1-CVE-2006-0745.patch:
 xf86Init.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xorg-server-1.0.1-CVE-2006-0745.patch ---
--- xorg-server-1.0.1/hw/xfree86/common/xf86Init.c.CVE-2006-0745	2006-03-15 14:22:28.000000000 -0500
+++ xorg-server-1.0.1/hw/xfree86/common/xf86Init.c	2006-03-15 14:22:55.000000000 -0500
@@ -1376,7 +1376,7 @@ ddxProcessArgument(int argc, char **argv
     }
   
   /* First the options that are only allowed for root */
-  if (getuid() == 0 || geteuid != 0)
+  if (getuid() == 0 || geteuid() != 0)
   {
     if (!strcmp(argv[i], "-modulepath"))
     {
@@ -1679,7 +1679,7 @@ ddxProcessArgument(int argc, char **argv
   }
   if (!strcmp(argv[i], "-configure"))
   {
-    if (getuid() != 0 && geteuid == 0) {
+    if (getuid() != 0 && geteuid() == 0) {
 	ErrorF("The '-configure' option can only be used by root.\n");
 	exit(1);
     }


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xorg-x11-server.spec	6 Mar 2006 20:38:28 -0000	1.45
+++ xorg-x11-server.spec	1 Apr 2006 18:36:49 -0000	1.46
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   8
+Release:   9
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -25,6 +25,8 @@
 Patch6:    xserver-1.0.1-randr-sdk.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=185084
+Patch8:    xorg-server-1.0.1-CVE-2006-0745.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
@@ -243,6 +245,7 @@
 %patch5 -p0 -b .backtrace
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
+%patch8 -p1 -b .CVE-2006-0745
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
@@ -522,6 +525,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Mar 15 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9
+- CVE-2006-0745 (bug 185084)
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1.0.1-8
 - build libxf86config with -fPIC (#181292)
 - fix sgi 1600sw extra mode (#182430)