---- hw/xfree86/os-support/linux/lnx_init.c 2005-08-26 09:35:55.000000000 +0200
-+++ hw/xfree86/os-support/linux/lnx_init.c 2005-12-22 10:52:06.630963000 +0100
-@@ -104,8 +104,10 @@
-
- /* when KeepTty check if we're run with euid==0 */
- if (KeepTty && geteuid() != 0)
-- FatalError("xf86OpenConsole:"
-- " Server must be suid root for option \"KeepTTY\"\n");
-+ FatalError("xf86OpenConsole: Server must be running with root "
-+ "permissions\n"
-+ "You should be using Xwrapper to start the server or xdm.\n"
-+ "We strongly advise against making the server SUID root!\n");
-
- /*
- * setup the virtual terminal manager
--- os/wrapper.c 1970-01-01 01:00:00.000000000 +0100
+++ os/wrapper.c 2005-12-22 10:50:53.610963000 +0100
@@ -0,0 +1,304 @@
+
--- os/Makefile.am 2005-12-06 16:50:35.000000000 +0100
+++ os/Makefile.am 2006-02-05 14:36:53.211755250 +0100
-@@ -29,6 +29,11 @@
+@@ -24,6 +24,11 @@
xprintf.c \
- $(XORG_SOURCES)
+ $(XORG_SRCS)
+bin_PROGRAMS = Xwrapper
+Xwrapper_SOURCES = wrapper.c
+Xwrapper_CFLAGS = -DUSE_PAM -DXSERVER_PATH=\"/usr/bin/Xorg\" $(AM_CFLAGS)
+Xwrapper_LDADD = -lpam_misc
+
- if XCSECURITY
- libos_la_SOURCES += $(XCSECURITY_SOURCES)
+ if SECURE_RPC
+ libos_la_SOURCES += $(SECURERPC_SRCS)
endif
---- os/Makefile.in 2005-12-21 08:36:40.000000000 +0100
-+++ os/Makefile.in 2006-02-05 14:56:34.701593750 +0100
-@@ -456,6 +456,11 @@
- $(XORG_SOURCES)\
- $(am__append_1) $(am__append_2) $(am__append_3) $(am__append_4)
-
-+bin_PROGRAMS = Xwrapper
-+Xwrapper_SOURCES = wrapper.c
-+Xwrapper_CFLAGS = -DUSE_PAM -DXSERVER_PATH=\"/usr/bin/Xorg\" $(AM_CFLAGS)
-+Xwrapper_LDADD = -lpam_misc
-+
- libcwrapper_la_SOURCES = \
- $(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c
-