[packages/XFree86.git] / XFree86-Xwrapper.patch

diff -urN XFree86-4.0.1.orig/xc/config/cf/Server.tmpl XFree86-4.0.1/xc/config/cf/Server.tmpl
--- XFree86-4.0.1.orig/xc/config/cf/Server.tmpl	Fri Feb 18 17:23:07 2000
+++ XFree86-4.0.1/xc/config/cf/Server.tmpl	Mon Jul 10 04:01:04 2000
@@ -31,8 +31,14 @@
 #ifndef MakeDllModules
 #define MakeDllModules NO
 #endif
+#ifndef XserverNeedsSetUID
+#define XserverNeedsSetUID NO
+#endif
+#ifndef UseXserverWrapper
+#define UseXserverWrapper XserverNeedsSetUID
+#endif
 #ifndef InstallServerSetUID
-#define InstallServerSetUID NO
+#define InstallServerSetUID (XserverNeedsSetUID && !UseXserverWrapper)
 #endif
 
 /*
diff -urN XFree86-4.0.1.orig/xc/config/cf/xf86site.def XFree86-4.0.1/xc/config/cf/xf86site.def
--- XFree86-4.0.1.orig/xc/config/cf/xf86site.def	Mon Jul 10 03:59:05 2000
+++ XFree86-4.0.1/xc/config/cf/xf86site.def	Mon Jul 10 04:01:04 2000
@@ -305,13 +305,15 @@
  */
 
 /*
- * If you only run the X server under xdm the X servers don't need to be
- * installed SetUID, and you may comment out the lines below.  If you run
- * the servers by hand (with xinit or startx), then they do need to be
- * installed SetUID on most OSs.
- * Consult your system administrator before making the X server setuid.
+ * The X servers need to run as root on most OSs.  We're now using a
+ * wrapper in that case, but we still need to make it known that the
+ * servers need SetUID.  When only using xdm, this (and the wrapper)
+ * are not required.  Disabling this automatically disables use of the
+ * wrapper.
  *
-#define InstallXserverSetUID	NO
+ * If you're only starting the Xservers with xdm set this to NO
+ *
+#define XserverNeedsSetUID	NO
  */
 
 /*
diff -urN XFree86-4.0.1.orig/xc/config/cf/xfree86.cf XFree86-4.0.1/xc/config/cf/xfree86.cf
--- XFree86-4.0.1.orig/xc/config/cf/xfree86.cf	Mon Jul 10 03:59:05 2000
+++ XFree86-4.0.1/xc/config/cf/xfree86.cf	Mon Jul 10 04:01:04 2000
@@ -550,12 +550,15 @@
 #endif
 
 /*
- * The default is to install the X servers setuid-root on most OSs.
- * It the servers are only started by xdm, they should not be setuid-root.
+ * The X servers need to run as root on most OSs.  We're now using a
+ * wrapper in that case, but we still need to make it known that the
+ * servers need SetUID.  When only using xdm, this (and the wrapper)
+ * are not required.  Disabling this automatically disables use of the
+ * wrapper.
  */
 #if !defined(i386MachArchitecture) && !defined(OS2Architecture)
-# ifndef InstallXserverSetUID
-#  define InstallXserverSetUID	YES
+# ifndef XserverNeedsSetUID
+#  define XserverNeedsSetUID	YES
 # endif
 #endif
 
diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/Imakefile XFree86-4.0.1/xc/programs/Xserver/Imakefile
--- XFree86-4.0.1.orig/xc/programs/Xserver/Imakefile	Sat Jun 17 20:42:16 2000
+++ XFree86-4.0.1/xc/programs/Xserver/Imakefile	Mon Jul 10 04:01:33 2000
@@ -4,11 +4,6 @@
  */
 XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.184 2000/06/17 00:03:10 martin Exp $
 
-#ifndef InstallXserverSetUID
-#define InstallXserverSetUID NO
-#endif
-#define InstallServerSetUID InstallXserverSetUID
-
 #include <Server.tmpl>
 
 #ifdef XFree86Version
@@ -257,6 +252,7 @@
         SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(USB) \
 	$(EXTRASYSLIBS)
 #endif
+	PAMLIBS = -lpam -lpam_misc -ldl
            CBRT = mi/LibraryTargetName(cbrt)
         STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS)
 
@@ -1012,6 +1008,11 @@
 	$(XVFBLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XVFBSYSLIBS))
 #endif /* XVirtualFramebufferServer */
 
+
+#if UseXserverWrapper
+SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
+InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
+#endif
 
 CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
 IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
--- XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c	Fri Feb 25 19:28:11 2000
+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c	Mon Jul 10 04:01:04 2000
@@ -65,7 +65,10 @@
 	/* check if we're run with euid==0 */
 	if (geteuid() != 0)
 	{
-	    FatalError("xf86OpenConsole: Server must be suid root\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");
 	}
 
 	/*
diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/os/Imakefile XFree86-4.0.1/xc/programs/Xserver/os/Imakefile
--- XFree86-4.0.1.orig/xc/programs/Xserver/os/Imakefile	Fri May  5 19:47:29 2000
+++ XFree86-4.0.1/xc/programs/Xserver/os/Imakefile	Mon Jul 10 04:01:33 2000
@@ -110,6 +110,7 @@
   ERROR_DEFINES = ServerErrorDefines
         DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) $(KRB5_DEFINES) $(RGB_DEFINES)
        INCLUDES = -I.  -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(TOP)/lib/Xau -I../lbx Krb5Includes
+	EXTRA_DEFINES = -DUSE_PAM
  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) $(CONNECTION_FLAGS)
        LINTLIBS = ../dix/llib-ldix.ln
 
@@ -153,6 +154,14 @@
 	cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
 #else
 SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
+#endif
+
+#if UseXserverWrapper
+AllTarget(wrapper.o)
+
+       WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"
+
+SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES))
 #endif
 
 #if HasKrb5
diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/os/wrapper.c XFree86-4.0.1/xc/programs/Xserver/os/wrapper.c
--- XFree86-4.0.1.orig/xc/programs/Xserver/os/wrapper.c	Thu Jan  1 01:00:00 1970
+++ XFree86-4.0.1/xc/programs/Xserver/os/wrapper.c	Mon Jul 10 04:01:33 2000
@@ -0,0 +1,304 @@
+/*
+ * X server wrapper.
+ *
+ * This wrapper makes some sanity checks on the command line arguments
+ * and environment variables when run with euid == 0 && euid != uid.
+ * If the checks fail, the wrapper exits with a message.
+ * If they succeed, it exec's the Xserver.
+ */
+
+/*
+ * Copyright (c) 1998 by The XFree86 Project, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
+ * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the XFree86 Project
+ * shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written
+ * authorization from the XFree86 Project.
+ */
+
+/* $XFree86: xc/programs/Xserver/os/wrapper.c,v 1.1.2.5 1998/02/27 15:28:59 dawes Exp $ */
+
+/* This is normally set in the Imakefile */
+#ifndef XSERVER_PATH
+#define XSERVER_PATH	"/etc/X11/X"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#ifdef USE_PAM
+#include <security/pam_appl.h>
+#include <security/pam_misc.h>
+#include <pwd.h>
+#endif /* USE_PAM */
+
+/* Neither of these should be required for XFree86 3.3.2 */
+#ifndef REJECT_CONFIG
+#define REJECT_CONFIG 0
+#endif
+#ifndef REJECT_XKBDIR
+#define REJECT_XKBDIR 0
+#endif
+
+/* Consider LD* variables insecure ? */
+#ifndef REMOVE_ENV_LD
+#define REMOVE_ENV_LD 1
+#endif
+
+/* Remove long environment variables? */
+#ifndef REMOVE_LONG_ENV
+#define REMOVE_LONG_ENV 1
+#endif
+
+/* Check args and env only if running setuid (euid == 0 && euid != uid) ? */
+#ifndef CHECK_EUID
+#define CHECK_EUID 1
+#endif
+
+/*
+ * Maybe the locale can be faked to make isprint(3) report that everything
+ * is printable?  Avoid it by default.
+ */
+#ifndef USE_ISPRINT
+#define USE_ISPRINT 0
+#endif
+
+#define MAX_ARG_LENGTH		128
+#define MAX_ENV_LENGTH		256
+#define MAX_ENV_PATH_LENGTH	2048
+
+#if USE_ISPRINT
+#include <ctype.h>
+#define checkPrintable(c) isprint(c)
+#else
+#define checkPrintable(c) (((c) & 0x7f) >= 0x20 && ((c) & 0x7f) != 0x7f)
+#endif
+
+enum BadCode {
+    NotBad = 0,
+    UnsafeArg,
+    ArgTooLong,
+    UnprintableArg,
+    EnvTooLong,
+    InternalError,
+#ifdef USE_PAM
+    PamFailed,
+    PamAuthFailed,
+#endif /* USE_PAM */
+};
+
+#define ARGMSG \
+    "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
+      "please send details of the arguments and why they are valid to\n" \
+      "XFree86@XFree86.org.  In the meantime, you can start the Xserver as\n" \
+      "the \"super user\" (root).\n"   
+
+#define ENVMSG \
+    "\nIf the environment is valid, and have been rejected incorrectly\n" \
+      "please send details of the environment and why it is valid to\n" \
+      "XFree86@XFree86.org.  In the meantime, you can start the Xserver as\n" \
+      "the \"super user\" (root).\n"
+
+#ifdef USE_PAM
+static struct pam_conv conv = {
+    misc_conv,
+    NULL
+};
+#endif /* USE_PAM */
+
+
+int
+main(int argc, char **argv, char **envp)
+{
+    enum BadCode bad = NotBad;
+    int i, j;
+    char *a, *e;
+#ifdef USE_PAM
+    pam_handle_t *pamh = NULL;
+    struct passwd *pw;
+    int retval;
+
+    pw = getpwuid(getuid());
+    if (pw == NULL) {
+	bad = InternalError;
+    }
+
+    if (!bad) {
+	retval = pam_start("xserver", pw->pw_name, &conv, &pamh);
+	if (retval != PAM_SUCCESS)
+	    bad = PamFailed;
+    }
+
+    if (!bad) {
+	retval = pam_authenticate(pamh, 0);
+	if (retval != PAM_SUCCESS) {
+	    pam_end(pamh, retval);
+	    bad = PamAuthFailed;
+	}
+    }
+
+    if (!bad) {
+	retval = pam_acct_mgmt(pamh, 0);
+	if (retval != PAM_SUCCESS) {
+	    pam_end(pamh, retval);
+	    bad = PamAuthFailed;
+	}
+    }
+
+    /* this is not a session, so do not do session management */
+
+    if (!bad) pam_end(pamh, PAM_SUCCESS);
+#endif /* USE_PAM */
+
+#if CHECK_EUID
+    if (!bad && geteuid() == 0 && getuid() != geteuid()) {
+#else
+    if (!bad) {
+#endif
+	/* Check each argv[] */
+	for (i = 1; i < argc; i++) {
+
+	    /* Check for known bad arguments */
+#if REJECT_CONFIG
+	    if (strcmp(argv[i], "-config") == 0) {
+		bad = UnsafeArg;
+		break;
+	    }
+#endif
+#if REJECT_XKBDIR
+	    if (strcmp(argv[i], "-xkbdir") == 0) {
+		bad = UnsafeArg;
+		break;
+	    }
+#endif
+	    if (strlen(argv[i]) > MAX_ARG_LENGTH) {
+		bad = ArgTooLong;
+		break;
+	    }
+	    a = argv[i];
+	    while (*a) {
+		if (checkPrintable(*a) == 0) {
+		    bad = UnprintableArg;
+		    break;
+		}
+		a++;
+	    }
+	    if (bad)
+		break;
+	}
+	/* Check each envp[] */
+	if (!bad)
+	    for (i = 0; envp[i]; i++) {
+
+		/* Check for bad environment variables and values */
+#if REMOVE_ENV_LD
+		while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) {
+		    for (j = i; envp[j]; j++) {
+			envp[j] = envp[j+1];
+		    }
+		}
+#endif   
+		if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) {
+#if REMOVE_LONG_ENV
+		    for (j = i; envp[j]; j++) {
+			envp[j] = envp[j+1];
+		    }
+		    i--;
+#else
+		    char *eq;
+		    int len;
+
+		    eq = strchr(envp[i], '=');
+		    if (!eq)
+			continue;
+		    len = eq - envp[i];
+		    e = malloc(len + 1);
+		    if (!e) {
+			bad = InternalError;
+			break;
+		    }
+		    strncpy(e, envp[i], len);
+		    e[len] = 0;
+		    if (len >= 4 &&
+			(strcmp(e + len - 4, "PATH") == 0 ||
+			 strcmp(e, "TERMCAP") == 0)) {
+			if (strlen(envp[i]) > MAX_ENV_PATH_LENGTH) {
+			    bad = EnvTooLong;
+			    break;
+			} else {
+			    free(e);
+			}
+		    } else {
+			bad = EnvTooLong;
+			break;
+		    }
+#endif
+		}
+	    }
+    }
+    switch (bad) {
+    case NotBad:
+	execve(XSERVER_PATH, argv, envp);
+	fprintf(stderr, "execve failed for %s (errno %d)\n", XSERVER_PATH,
+		errno);
+	break;
+    case UnsafeArg:
+	fprintf(stderr, "Command line argument number %d is unsafe\n", i);
+	fprintf(stderr, ARGMSG);
+	break;
+    case ArgTooLong:
+	fprintf(stderr, "Command line argument number %d is too long\n", i);
+	fprintf(stderr, ARGMSG);
+	break;
+    case UnprintableArg:
+	fprintf(stderr, "Command line argument number %d contains unprintable"
+		" characters\n", i);
+	fprintf(stderr, ARGMSG);
+	break;
+    case EnvTooLong:
+	fprintf(stderr, "Environment variable `%s' is too long\n", e);
+	fprintf(stderr, ENVMSG);
+	break;
+    case InternalError:
+	fprintf(stderr, "Internal Error\n");
+	break;
+#ifdef USE_PAM
+    case PamFailed:
+	fprintf(stderr, "Authentication System Failure, "
+			"missing or mangled PAM configuration file or module?\n");
+	break;
+    case PamAuthFailed:
+	fprintf(stderr, "PAM authentication failed\n");
+	break;
+#endif
+    default:
+	fprintf(stderr, "Unknown error\n");
+	fprintf(stderr, ARGMSG);
+	fprintf(stderr, ENVMSG);
+	break;
+    }
+    exit(1);
+}
+
diff -urN XFree86-4.0.1.orig/xc/programs/xinit/xinit.c XFree86-4.0.1/xc/programs/xinit/xinit.c
--- XFree86-4.0.1.orig/xc/programs/xinit/xinit.c	Wed Apr  5 20:14:08 2000
+++ XFree86-4.0.1/xc/programs/xinit/xinit.c	Mon Jul 10 04:01:04 2000
@@ -143,6 +143,7 @@
 #define	OK_EXIT		0
 #define	ERR_EXIT	1
 
+char *default_wrapper = BINDIR "/Xwrapper";
 char *default_server = "X";
 char *default_display = ":0";		/* choose most efficient */
 #ifndef __EMX__
@@ -312,7 +313,10 @@
 	if (argc == 0 ||
 #ifndef __EMX__
 	    (**argv != '/' && **argv != '.')) {
-		*sptr++ = default_server;
+		if (access(default_wrapper, X_OK) == 0)
+			*sptr++ = default_wrapper;
+		else
+			*sptr++ = default_server;
 #else
 	    (**argv != '/' && **argv != '\\' && **argv != '.' &&
 	     !(isalpha(**argv) && (*argv)[1]==':'))) {
Commit	Line	Data
e2d64aaf JR	1	diff -urN XFree86-4.0.1.orig/xc/config/cf/Server.tmpl XFree86-4.0.1/xc/config/cf/Server.tmpl
	2	--- XFree86-4.0.1.orig/xc/config/cf/Server.tmpl Fri Feb 18 17:23:07 2000
	3	+++ XFree86-4.0.1/xc/config/cf/Server.tmpl Mon Jul 10 04:01:04 2000
	4	@@ -31,8 +31,14 @@
	5	#ifndef MakeDllModules
	6	#define MakeDllModules NO
	7	#endif
	8	+#ifndef XserverNeedsSetUID
	9	+#define XserverNeedsSetUID NO
	10	+#endif
	11	+#ifndef UseXserverWrapper
	12	+#define UseXserverWrapper XserverNeedsSetUID
	13	+#endif
	14	#ifndef InstallServerSetUID
	15	-#define InstallServerSetUID NO
	16	+#define InstallServerSetUID (XserverNeedsSetUID && !UseXserverWrapper)
	17	#endif
	18
	19	/*
	20	diff -urN XFree86-4.0.1.orig/xc/config/cf/xf86site.def XFree86-4.0.1/xc/config/cf/xf86site.def
	21	--- XFree86-4.0.1.orig/xc/config/cf/xf86site.def Mon Jul 10 03:59:05 2000
	22	+++ XFree86-4.0.1/xc/config/cf/xf86site.def Mon Jul 10 04:01:04 2000
	23	@@ -305,13 +305,15 @@
	24	*/
	25
	26	/*
	27	- * If you only run the X server under xdm the X servers don't need to be
	28	- * installed SetUID, and you may comment out the lines below. If you run
	29	- * the servers by hand (with xinit or startx), then they do need to be
	30	- * installed SetUID on most OSs.
	31	- * Consult your system administrator before making the X server setuid.
	32	+ * The X servers need to run as root on most OSs. We're now using a
	33	+ * wrapper in that case, but we still need to make it known that the
	34	+ * servers need SetUID. When only using xdm, this (and the wrapper)
	35	+ * are not required. Disabling this automatically disables use of the
	36	+ * wrapper.
	37	*
	38	-#define InstallXserverSetUID NO
	39	+ * If you're only starting the Xservers with xdm set this to NO
	40	+ *
	41	+#define XserverNeedsSetUID NO
	42	*/
	43
	44	/*
	45	diff -urN XFree86-4.0.1.orig/xc/config/cf/xfree86.cf XFree86-4.0.1/xc/config/cf/xfree86.cf
	46	--- XFree86-4.0.1.orig/xc/config/cf/xfree86.cf Mon Jul 10 03:59:05 2000
	47	+++ XFree86-4.0.1/xc/config/cf/xfree86.cf Mon Jul 10 04:01:04 2000
	48	@@ -550,12 +550,15 @@
	49	#endif
	50
	51	/*
	52	- * The default is to install the X servers setuid-root on most OSs.
	53	- * It the servers are only started by xdm, they should not be setuid-root.
	54	+ * The X servers need to run as root on most OSs. We're now using a
	55	+ * wrapper in that case, but we still need to make it known that the
	56	+ * servers need SetUID. When only using xdm, this (and the wrapper)
	57	+ * are not required. Disabling this automatically disables use of the
	58	+ * wrapper.
	59	*/
	60	#if !defined(i386MachArchitecture) && !defined(OS2Architecture)
	61	-# ifndef InstallXserverSetUID
	62	-# define InstallXserverSetUID YES
	63	+# ifndef XserverNeedsSetUID
	64	+# define XserverNeedsSetUID YES
65	# endif
66	#endif
67
68	diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/Imakefile XFree86-4.0.1/xc/programs/Xserver/Imakefile
69	--- XFree86-4.0.1.orig/xc/programs/Xserver/Imakefile Sat Jun 17 20:42:16 2000
70	+++ XFree86-4.0.1/xc/programs/Xserver/Imakefile Mon Jul 10 04:01:33 2000
71	@@ -4,11 +4,6 @@
72	*/
73	XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.184 2000/06/17 00:03:10 martin Exp $
74
75	-#ifndef InstallXserverSetUID
76	-#define InstallXserverSetUID NO
77	-#endif
78	-#define InstallServerSetUID InstallXserverSetUID
79	-
80	#include <Server.tmpl>
81
82	#ifdef XFree86Version
83	@@ -257,6 +252,7 @@
84	SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(USB) \
85	$(EXTRASYSLIBS)
86	#endif
87	+ PAMLIBS = -lpam -lpam_misc -ldl
88	CBRT = mi/LibraryTargetName(cbrt)
89	STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS)
90
91	@@ -1012,6 +1008,11 @@
92	$(XVFBLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XVFBSYSLIBS))
93	#endif /* XVirtualFramebufferServer */
94
95	+
96	+#if UseXserverWrapper
97	+SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
98	+InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
99	+#endif
100
101	CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
102	IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
103	diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
104	--- XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Fri Feb 25 19:28:11 2000
105	+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Mon Jul 10 04:01:04 2000
106	@@ -65,7 +65,10 @@
107	/* check if we're run with euid==0 */
108	if (geteuid() != 0)
109	{
110	- FatalError("xf86OpenConsole: Server must be suid root\n");
111	+ FatalError("xf86OpenConsole: Server must be running with root "
112	+ "permissions\n"
113	+ "You should be using Xwrapper to start the server or xdm.\n"
114	+ "We strongly advise against making the server SUID root!\n");
115	}
116
117	/*
118	diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/os/Imakefile XFree86-4.0.1/xc/programs/Xserver/os/Imakefile
119	--- XFree86-4.0.1.orig/xc/programs/Xserver/os/Imakefile Fri May 5 19:47:29 2000
120	+++ XFree86-4.0.1/xc/programs/Xserver/os/Imakefile Mon Jul 10 04:01:33 2000
121	@@ -110,6 +110,7 @@
122	ERROR_DEFINES = ServerErrorDefines
123	DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) $(KRB5_DEFINES) $(RGB_DEFINES)
124	INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(TOP)/lib/Xau -I../lbx Krb5Includes
125	+ EXTRA_DEFINES = -DUSE_PAM
126	DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) $(CONNECTION_FLAGS)
127	LINTLIBS = ../dix/llib-ldix.ln
128
129	@@ -153,6 +154,14 @@
130	cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
131	#else
132	SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
133	+#endif
134	+
135	+#if UseXserverWrapper
136	+AllTarget(wrapper.o)
137	+
138	+ WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"
139	+
140	+SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES))
141	#endif
142
143	#if HasKrb5
144	diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/os/wrapper.c XFree86-4.0.1/xc/programs/Xserver/os/wrapper.c
145	--- XFree86-4.0.1.orig/xc/programs/Xserver/os/wrapper.c Thu Jan 1 01:00:00 1970
146	+++ XFree86-4.0.1/xc/programs/Xserver/os/wrapper.c Mon Jul 10 04:01:33 2000
147	@@ -0,0 +1,304 @@
148	+/*
149	+ * X server wrapper.
150	+ *
151	+ * This wrapper makes some sanity checks on the command line arguments
152	+ * and environment variables when run with euid == 0 && euid != uid.
153	+ * If the checks fail, the wrapper exits with a message.
154	+ * If they succeed, it exec's the Xserver.
155	+ */
156	+
157	+/*
158	+ * Copyright (c) 1998 by The XFree86 Project, Inc. All Rights Reserved.
159	+ *
160	+ * Permission is hereby granted, free of charge, to any person obtaining
161	+ * a copy of this software and associated documentation files (the
162	+ * "Software"), to deal in the Software without restriction, including
163	+ * without limitation the rights to use, copy, modify, merge, publish,
164	+ * distribute, sublicense, and/or sell copies of the Software, and to
165	+ * permit persons to whom the Software is furnished to do so, subject
166	+ * to the following conditions:
167	+ *
168	+ * The above copyright notice and this permission notice shall be included
169	+ * in all copies or substantial portions of the Software.
170	+ *
171	+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
172	+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
173	+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
174	+ * IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
175	+ * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
176	+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
177	+ * OR OTHER DEALINGS IN THE SOFTWARE.
178	+ *
179	+ * Except as contained in this notice, the name of the XFree86 Project
180	+ * shall not be used in advertising or otherwise to promote the sale,
181	+ * use or other dealings in this Software without prior written
182	+ * authorization from the XFree86 Project.
183	+ */
184	+
185	+/* $XFree86: xc/programs/Xserver/os/wrapper.c,v 1.1.2.5 1998/02/27 15:28:59 dawes Exp $ */
186	+
187	+/* This is normally set in the Imakefile */
188	+#ifndef XSERVER_PATH
189	+#define XSERVER_PATH "/etc/X11/X"
190	+#endif
191	+
192	+#include <stdio.h>
193	+#include <stdlib.h>
194	+#include <string.h>
195	+#include <errno.h>
196	+#include <unistd.h>
197	+#include <sys/types.h>
198	+#ifdef USE_PAM
199	+#include <security/pam_appl.h>
200	+#include <security/pam_misc.h>
201	+#include <pwd.h>
202	+#endif /* USE_PAM */
203	+
204	+/* Neither of these should be required for XFree86 3.3.2 */
205	+#ifndef REJECT_CONFIG
206	+#define REJECT_CONFIG 0
207	+#endif
208	+#ifndef REJECT_XKBDIR
209	+#define REJECT_XKBDIR 0
210	+#endif
211	+
212	+/* Consider LD* variables insecure ? */
213	+#ifndef REMOVE_ENV_LD
214	+#define REMOVE_ENV_LD 1
215	+#endif
216	+
217	+/* Remove long environment variables? */
218	+#ifndef REMOVE_LONG_ENV
219	+#define REMOVE_LONG_ENV 1
220	+#endif
221	+
222	+/* Check args and env only if running setuid (euid == 0 && euid != uid) ? */
223	+#ifndef CHECK_EUID
224	+#define CHECK_EUID 1
225	+#endif
226	+
227	+/*
228	+ * Maybe the locale can be faked to make isprint(3) report that everything
229	+ * is printable? Avoid it by default.
230	+ */
231	+#ifndef USE_ISPRINT
232	+#define USE_ISPRINT 0
233	+#endif
234	+
235	+#define MAX_ARG_LENGTH 128
236	+#define MAX_ENV_LENGTH 256
237	+#define MAX_ENV_PATH_LENGTH 2048
238	+
239	+#if USE_ISPRINT
240	+#include <ctype.h>
241	+#define checkPrintable(c) isprint(c)
242	+#else
243	+#define checkPrintable(c) (((c) & 0x7f) >= 0x20 && ((c) & 0x7f) != 0x7f)
244	+#endif
245	+
246	+enum BadCode {
247	+ NotBad = 0,
248	+ UnsafeArg,
249	+ ArgTooLong,
250	+ UnprintableArg,
251	+ EnvTooLong,
252	+ InternalError,
253	+#ifdef USE_PAM
254	+ PamFailed,
255	+ PamAuthFailed,
256	+#endif /* USE_PAM */
257	+};
258	+
259	+#define ARGMSG \
260	+ "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
261	+ "please send details of the arguments and why they are valid to\n" \
262	+ "XFree86@XFree86.org. In the meantime, you can start the Xserver as\n" \
263	+ "the \"super user\" (root).\n"
264	+
265	+#define ENVMSG \
266	+ "\nIf the environment is valid, and have been rejected incorrectly\n" \
267	+ "please send details of the environment and why it is valid to\n" \
268	+ "XFree86@XFree86.org. In the meantime, you can start the Xserver as\n" \
269	+ "the \"super user\" (root).\n"
270	+
271	+#ifdef USE_PAM
272	+static struct pam_conv conv = {
273	+ misc_conv,
274	+ NULL
275	+};
276	+#endif /* USE_PAM */
277	+
278	+
279	+int
280	+main(int argc, char argv, char envp)
281	+{
282	+ enum BadCode bad = NotBad;
283	+ int i, j;
284	+ char a, e;
285	+#ifdef USE_PAM
286	+ pam_handle_t *pamh = NULL;
287	+ struct passwd *pw;
288	+ int retval;
289	+
290	+ pw = getpwuid(getuid());
291	+ if (pw == NULL) {
292	+ bad = InternalError;
293	+ }
294	+
295	+ if (!bad) {
296	+ retval = pam_start("xserver", pw->pw_name, &conv, &pamh);
297	+ if (retval != PAM_SUCCESS)
298	+ bad = PamFailed;
299	+ }
300	+
301	+ if (!bad) {
302	+ retval = pam_authenticate(pamh, 0);
303	+ if (retval != PAM_SUCCESS) {
304	+ pam_end(pamh, retval);
305	+ bad = PamAuthFailed;
306	+ }
307	+ }
308	+
309	+ if (!bad) {
310	+ retval = pam_acct_mgmt(pamh, 0);
311	+ if (retval != PAM_SUCCESS) {
312	+ pam_end(pamh, retval);
313	+ bad = PamAuthFailed;
314	+ }
315	+ }
316	+
317	+ /* this is not a session, so do not do session management */
318	+
319	+ if (!bad) pam_end(pamh, PAM_SUCCESS);
320	+#endif /* USE_PAM */
321	+
322	+#if CHECK_EUID
323	+ if (!bad && geteuid() == 0 && getuid() != geteuid()) {
324	+#else
325	+ if (!bad) {
326	+#endif
327	+ /* Check each argv[] */
328	+ for (i = 1; i < argc; i++) {
329	+
330	+ /* Check for known bad arguments */
331	+#if REJECT_CONFIG
332	+ if (strcmp(argv[i], "-config") == 0) {
333	+ bad = UnsafeArg;
334	+ break;
335	+ }
336	+#endif
337	+#if REJECT_XKBDIR
338	+ if (strcmp(argv[i], "-xkbdir") == 0) {
339	+ bad = UnsafeArg;
340	+ break;
341	+ }
342	+#endif
343	+ if (strlen(argv[i]) > MAX_ARG_LENGTH) {
344	+ bad = ArgTooLong;
345	+ break;
346	+ }
347	+ a = argv[i];
348	+ while (*a) {
349	+ if (checkPrintable(*a) == 0) {
350	+ bad = UnprintableArg;
351	+ break;
352	+ }
353	+ a++;
354	+ }
355	+ if (bad)
356	+ break;
357	+ }
358	+ /* Check each envp[] */
359	+ if (!bad)
360	+ for (i = 0; envp[i]; i++) {
361	+
362	+ /* Check for bad environment variables and values */
363	+#if REMOVE_ENV_LD
364	+ while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) {
365	+ for (j = i; envp[j]; j++) {
366	+ envp[j] = envp[j+1];
367	+ }
368	+ }
369	+#endif
370	+ if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) {
371	+#if REMOVE_LONG_ENV
372	+ for (j = i; envp[j]; j++) {
373	+ envp[j] = envp[j+1];
374	+ }
375	+ i--;
376	+#else
377	+ char *eq;
378	+ int len;
379	+
380	+ eq = strchr(envp[i], '=');
381	+ if (!eq)
382	+ continue;
383	+ len = eq - envp[i];
384	+ e = malloc(len + 1);
385	+ if (!e) {
386	+ bad = InternalError;
387	+ break;
388	+ }
389	+ strncpy(e, envp[i], len);
390	+ e[len] = 0;
391	+ if (len >= 4 &&
392	+ (strcmp(e + len - 4, "PATH") == 0 \|\|
393	+ strcmp(e, "TERMCAP") == 0)) {
394	+ if (strlen(envp[i]) > MAX_ENV_PATH_LENGTH) {
395	+ bad = EnvTooLong;
396	+ break;
397	+ } else {
398	+ free(e);
399	+ }
400	+ } else {
401	+ bad = EnvTooLong;
402	+ break;
403	+ }
404	+#endif
405	+ }
406	+ }
407	+ }
408	+ switch (bad) {
409	+ case NotBad:
410	+ execve(XSERVER_PATH, argv, envp);
411	+ fprintf(stderr, "execve failed for %s (errno %d)\n", XSERVER_PATH,
412	+ errno);
413	+ break;
414	+ case UnsafeArg:
415	+ fprintf(stderr, "Command line argument number %d is unsafe\n", i);
416	+ fprintf(stderr, ARGMSG);
417	+ break;
418	+ case ArgTooLong:
419	+ fprintf(stderr, "Command line argument number %d is too long\n", i);
420	+ fprintf(stderr, ARGMSG);
421	+ break;
422	+ case UnprintableArg:
423	+ fprintf(stderr, "Command line argument number %d contains unprintable"
424	+ " characters\n", i);
425	+ fprintf(stderr, ARGMSG);
426	+ break;
427	+ case EnvTooLong:
428	+ fprintf(stderr, "Environment variable `%s' is too long\n", e);
429	+ fprintf(stderr, ENVMSG);
430	+ break;
431	+ case InternalError:
432	+ fprintf(stderr, "Internal Error\n");
433	+ break;
434	+#ifdef USE_PAM
435	+ case PamFailed:
436	+ fprintf(stderr, "Authentication System Failure, "
437	+ "missing or mangled PAM configuration file or module?\n");
438	+ break;
439	+ case PamAuthFailed:
440	+ fprintf(stderr, "PAM authentication failed\n");
441	+ break;
442	+#endif
443	+ default:
444	+ fprintf(stderr, "Unknown error\n");
445	+ fprintf(stderr, ARGMSG);
446	+ fprintf(stderr, ENVMSG);
447	+ break;
448	+ }
449	+ exit(1);
450	+}
451	+
452	diff -urN XFree86-4.0.1.orig/xc/programs/xinit/xinit.c XFree86-4.0.1/xc/programs/xinit/xinit.c
453	--- XFree86-4.0.1.orig/xc/programs/xinit/xinit.c Wed Apr 5 20:14:08 2000
454	+++ XFree86-4.0.1/xc/programs/xinit/xinit.c Mon Jul 10 04:01:04 2000
455	@@ -143,6 +143,7 @@
456	#define OK_EXIT 0
457	#define ERR_EXIT 1
458
459	+char *default_wrapper = BINDIR "/Xwrapper";
460	char *default_server = "X";
461	char default_display = ":0"; / choose most efficient */
462	#ifndef __EMX__
463	@@ -312,7 +313,10 @@
464	if (argc == 0 \|\|
465	#ifndef __EMX__
466	(argv != '/' && argv != '.')) {
467	- *sptr++ = default_server;
468	+ if (access(default_wrapper, X_OK) == 0)
469	+ *sptr++ = default_wrapper;
470	+ else
471	+ *sptr++ = default_server;
472	#else
473	(argv != '/' && argv != '\\' && **argv != '.' &&
474	!(isalpha(*argv) && (argv)[1]==':'))) {