backout hard-coded behaviour change which was not discussed, in

particular no justification for why the current behaviour is wrong

5 files changed, 12 insertions, 19 deletions

diff --git a/app/xenodm/config/Xsetup_0 b/app/xenodm/config/Xsetup_0
index b5898648f..acf72a923 100644
--- a/app/xenodm/config/Xsetup_0
+++ b/app/xenodm/config/Xsetup_0
@@ -1,6 +1,6 @@
 #!/bin/sh
-# $OpenBSD: Xsetup_0,v 1.2 2017/08/30 07:48:56 dcoppa Exp $
-if [ "$DISPLAY" = "unix:0" -o "$DISPLAY" = ":0" -o "$DISPLAY" = ":0.0" ]
+# $OpenBSD: Xsetup_0,v 1.3 2017/09/05 17:48:07 deraadt Exp $
+if [ "$DISPLAY" = ":0" -o "$DISPLAY" = ":0.0" ]
 then
 	xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
 fi
diff --git a/app/xenodm/config/xenodm-config.in b/app/xenodm/config/xenodm-config.in
index 5d47e08b8..5c5e35402 100644
--- a/app/xenodm/config/xenodm-config.in
+++ b/app/xenodm/config/xenodm-config.in
@@ -1,4 +1,4 @@
-! $OpenBSD: xenodm-config.in,v 1.3 2017/08/30 07:59:00 dcoppa Exp $
+! $OpenBSD: xenodm-config.in,v 1.4 2017/09/05 17:48:07 deraadt Exp $
 !
 DisplayManager.authDir:	@XENODMXAUTHDIR@
 DisplayManager.errorLogFile:	@XENODMLOGDIR@/xenodm.log
@@ -14,9 +14,9 @@ DisplayManager*startup:		@XENODMSCRIPTDIR@/Xstartup
 DisplayManager*session:		@XENODMSCRIPTDIR@/Xsession
 DisplayManager*reset:		@XENODMSCRIPTDIR@/Xreset
 DisplayManager*authComplain:	true
-! The following three resources set up display unix:0 as the console.
-DisplayManager.unix_0.setup:	@XENODMSCRIPTDIR@/Xsetup_0
-DisplayManager.unix_0.startup:	@XENODMSCRIPTDIR@/GiveConsole
-DisplayManager.unix_0.reset:	@XENODMSCRIPTDIR@/TakeConsole
+! The following three resources set up display :0 as the console.
+DisplayManager._0.setup:	@XENODMSCRIPTDIR@/Xsetup_0
+DisplayManager._0.startup:	@XENODMSCRIPTDIR@/GiveConsole
+DisplayManager._0.reset:	@XENODMSCRIPTDIR@/TakeConsole
 
 DisplayManager.*.authName:	MIT-MAGIC-COOKIE-1
diff --git a/app/xenodm/configure b/app/xenodm/configure
index f7cf82228..1686d7e24 100755
--- a/app/xenodm/configure
+++ b/app/xenodm/configure
@@ -19747,12 +19747,12 @@ fi
 # Defaults for X session - should probably be configure --with-* flags
 # Currently just trying to mirror what defaults were set in Imake
 
-# -DDEF_SERVER_LINE="unix:0 local $(DEF_SERVER) :0"
+# -DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"
 if test -z "$DEF_SERVER" ; then
 	DEF_SERVER="${bindir}/X"
 fi
 if test -z "$DEF_SERVER_LINE" ; then
-	DEF_SERVER_LINE="unix:0 local ${DEF_SERVER} :0"
+	DEF_SERVER_LINE=":0 local ${DEF_SERVER} :0"
 fi
 
   prefix_NONE=
diff --git a/app/xenodm/configure.ac b/app/xenodm/configure.ac
index d40be3b2d..76702564e 100644
--- a/app/xenodm/configure.ac
+++ b/app/xenodm/configure.ac
@@ -207,12 +207,12 @@ AC_SUBST(XENODM_LIBS)
 # Defaults for X session - should probably be configure --with-* flags
 # Currently just trying to mirror what defaults were set in Imake
 
-# -DDEF_SERVER_LINE="unix:0 local $(DEF_SERVER) :0"
+# -DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"
 if test -z "$DEF_SERVER" ; then
 	DEF_SERVER="${bindir}/X"
 fi
 if test -z "$DEF_SERVER_LINE" ; then
-	DEF_SERVER_LINE="unix:0 local ${DEF_SERVER} :0"
+	DEF_SERVER_LINE=":0 local ${DEF_SERVER} :0"
 fi
 AX_DEFINE_DIR(DEF_SERVER_LINE, DEF_SERVER_LINE,
 	[Define to default Xserver file entry for local X server])
diff --git a/app/xinit/xinit.c b/app/xinit/xinit.c
index ff2b7b28f..1b049117c 100644
--- a/app/xinit/xinit.c
+++ b/app/xinit/xinit.c
@@ -653,14 +653,7 @@ shutdown(void)
 static void
 set_environment(void)
 {
-    char displayEnv[128];
-    int ret;
-
-    ret = snprintf(displayEnv, sizeof(displayEnv), "unix%s", displayNum);
-    if (ret < 0 || ret >= sizeof(displayEnv))
-        Fatalx("unable to set DISPLAY");
-
-    if (setenv("DISPLAY", displayEnv, TRUE) == -1)
+    if (setenv("DISPLAY", displayNum, TRUE) == -1)
         Fatal("unable to set DISPLAY");
 }