summarylogtreecommitdiffstats
path: root/06_move_serverauthfile_into_tmp.diff
diff options
context:
space:
mode:
Diffstat (limited to '06_move_serverauthfile_into_tmp.diff')
-rw-r--r--06_move_serverauthfile_into_tmp.diff21
1 files changed, 21 insertions, 0 deletions
diff --git a/06_move_serverauthfile_into_tmp.diff b/06_move_serverauthfile_into_tmp.diff
new file mode 100644
index 00000000000..dde11e3835b
--- /dev/null
+++ b/06_move_serverauthfile_into_tmp.diff
@@ -0,0 +1,21 @@
+Move startx auth files in /tmp so they are removed on reboot.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xinit/startx.cpp
+===================================================================
+--- xinit.orig/startx.cpp
++++ xinit/startx.cpp
+@@ -273,7 +273,7 @@
+ dummy=0
+
+ XCOMM create a file with auth information for the server. ':0' is a dummy.
+- xserverauthfile=$HOME/.serverauth.$$
++ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
+ trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+ xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
+