ssh -X: always use ~/.Xauthority #81

mviereck · Oct 20, 2018 · 9c0eeef · 9c0eeef
1 parent d09cbd4
commit 9c0eeef
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/x11docker b/x11docker
@@ -5050,7 +5050,8 @@ check_hostxenv() {              # check environment variables for host X display
   # get cookie from host display
   XAUTHORITY=${XAUTHORITY:-}
   [ -z "$XAUTHORITY" ] && XAUTHORITY="$(systemctl --user show-environment | grep XAUTHORITY= | cut -d= -f2)"
-  [ -z "$XAUTHORITY" ] && [ -e "$Hostuserhome/.Xauthority" ] && XAUTHORITY="$Hostuserhome/.Xauthority"
+  [ -z "$XAUTHORITY" ]   && [ -e "$Hostuserhome/.Xauthority" ] && XAUTHORITY="$Hostuserhome/.Xauthority"
+  [ "$Hostssh" = "yes" ] && [ -e "$Hostuserhome/.Xauthority" ] && XAUTHORITY="$Hostuserhome/.Xauthority"
   [ "${XAUTHORITY:-}" ] && {
     $Mksu "$Xauthexe -i -f ${XAUTHORITY:-} nlist $Hostdisplay 2>/dev/null | rmcr | $Xauthexe -f $Hostxauthority nmerge - 2>/dev/null"
     chown $Hostuser $Hostxauthority
@@ -6558,7 +6559,6 @@ todo() {
 # further checks of pam.d
 # --internet to allow internet access, otherwise --net=none?
 # --group-add: further checks? mismatch messagebus-101-systemd-journal
-# option --pull to force 'docker pull'? Keeps image up to date with docker hub.
 
 # MSYS2/Cygwin/WSL:
 #       needs test: