xserver: Branch 'master'

[Donnie Berkholz]

 hw/xfree86/parser/write.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 50a3e1ad18c815a5adafee22beccdf970bae62d6 (from 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea)
Author: Rudo Thomas <rudo at matfyz.cz>
Date:   Sat Jul 1 12:34:36 2006 -0700

    Missing close parenthesis in one of the setuid() fixes.

diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
index 82baa5a..de3bb8a 100644
--- a/hw/xfree86/parser/write.c
+++ b/hw/xfree86/parser/write.c
@@ -170,7 +170,7 @@ xf86writeConfigFile (const char *filenam
 					strerror(errno));
 			return 0;
 		case 0: /* child */
-			if (setuid(getuid() == -1) 
+			if (setuid(getuid()) == -1) 
 			    FatalError("xf86writeConfigFile(): "
 				"setuid failed(%s)\n", 
 				strerror(errno));