--hostdisplay: allow missing xauth if host X has no cookie, too. #219

x11docker

@@ -6056,9 +6056,6 @@ check_host() {                  # check host environment
   [ "${0:-}" = "${BASH_SOURCE:-}" ] && Runssourced="no" || Runssourced="yes"
 
   Hostsystem="$(grep '^ID=' /etc/os-release 2>/dev/null | cut -d= -f2 || echo 'unknown')"
-
-  # Check if docker is installed with Ubuntu snap
-  myrealpath "$(command -v docker)" | grep -q snap && Runsinsnap="yes" || Runsinsnap="no"
 
   # Check libc from host. If same as in container, it is possible to share timezone file
   Hostlibc="unknown"
@@ -6128,6 +6125,9 @@ check_host() {                  # check host environment
     ;;
   esac
 
+  # Check if docker is installed with snap/snappy
+  myrealpath "$(command -v "${Dockerexe:-docker_not_found}")" | grep -q snap && Runsinsnap="yes" || Runsinsnap="no"
+
   # Provide dos->unix newline converter to unpriv() commands
   export -f rmcr
 
@@ -6315,6 +6315,7 @@ check_hostxenv() {              # check environment variables for host X display
   return 0
 }
 check_option_interferences() {  # check multiple option interferences, change settings if needed
+  local Message
 
   [ "$Desktopmode" = "no" ] && case $Xserver in
     --xephyr|--weston-xwayland|--kwin-xwayland|--xorg) Windowmanagermode="auto" ;;
@@ -6428,13 +6429,15 @@ check_option_interferences() {  # check multiple option interferences, change se
     *)
       command -v xauth >/dev/null || {
         case $Xoverip in
-          yes) 
-            error "Command 'xauth' not found.
+          yes)
+            [ -z "$Hostxauthority" ] && [ "$Xserver" = "--hostdisplay" ] && Message=warning || Message=error
+            $Message "Command 'xauth' not found.
       SECURITY RISK!
   Your X server would be accessable over network without authentication!
   That could be abused to take control over your system.
   Please install 'xauth' to allow X cookie authentication.
   You can disable cookie authentication with discouraged option --no-auth."
+            Xauthentication="no"
           ;;
           no|"")
             warning "Command 'xauth' not found.