summarylogtreecommitdiffstats
path: root/fs25361.patch
blob: 046968576e513ceaed58b613e9e1bb4473785c14 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
diff -u xinit.orig/startx.cpp xinit/startx.cpp
--- xinit.orig/startx.cpp	2011-08-02 18:26:57.161711018 +0400
+++ xinit/startx.cpp	2011-08-02 19:06:39.348816866 +0400
@@ -290,9 +290,9 @@
     XCOMM now add the same credentials to the client authority file
     XCOMM if '$displayname' already exists do not overwrite it as another
     XCOMM server may need it. Add them to the '$xserverauthfile' instead.
-    for displayname in $authdisplay $hostname$authdisplay; do
+    for displayname in $authdisplay $hostname/unix$authdisplay; do
         authcookie=`XAUTH list "$displayname" @@
-        | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
+        | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
         if [ "z${authcookie}" = "z" ] ; then
             XAUTH -q << EOF 
 add $displayname . $mcookie