fs25361.patch 946 B

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