--- xinit-1.3.4/startx.cpp.orig	2014-09-12 02:31:42.000000000 +0900
+++ xinit-1.3.4/startx.cpp	2014-12-19 14:35:43.000000000 +0900
@@ -13,6 +13,7 @@
 
 unset DBUS_SESSION_BUS_ADDRESS
 unset SESSION_MANAGER
+unset XDG_SESSION_COOKIE
 
 #ifdef __APPLE__
 
@@ -266,24 +267,7 @@
         echo "Couldn't create cookie"
         exit 1
     fi
-    dummy=0
 
-    XCOMM create a file with auth information for the server. ':0' is a dummy.
-    xserverauthfile=$HOME/.serverauth.$$
-    trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
-    xauth -q -f "$xserverauthfile" << EOF
-add :$dummy . $mcookie
-EOF
-#if defined(__APPLE__) || defined(__CYGWIN__)
-    xserverauthfilequoted=$(echo ${xserverauthfile} | sed "s/'/'\\\\''/g")
-    serverargs=${serverargs}" -auth '"${xserverauthfilequoted}"'"
-#else
-    serverargs=${serverargs}" -auth "${xserverauthfile}
-#endif
-
-    XCOMM now add the same credentials to the client authority file
-    XCOMM if '$displayname' already exists do not overwrite it as another
-    XCOMM server man need it. Add them to the '$xserverauthfile' instead.
     for displayname in $authdisplay $hostname$authdisplay; do
         authcookie=`XAUTH list "$displayname" @@
         | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
@@ -292,11 +276,6 @@
 add $displayname . $mcookie
 EOF
         removelist="$displayname $removelist"
-        else
-            dummy=$(($dummy+1));
-            XAUTH -q -f "$xserverauthfile" << EOF
-add :$dummy . $authcookie
-EOF
         fi
     done
 fi
@@ -312,9 +291,6 @@
     if [ x"$removelist" != x ]; then
         XAUTH remove $removelist
     fi
-    if [ x"$xserverauthfile" != x ]; then
-        rm -f "$xserverauthfile"
-    fi
 fi
 
 /*