From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 29 Dec 2015 13:24:55 +0000 (+0100)
Subject: Check that xauth is in PATH
X-Git-Tag: v1.6.90~48^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=817dcecdf83ff25eea11f2bca8f436db175b4bc2;p=tigervnc.git

Check that xauth is in PATH

The rest of the code assumes xauth is in PATH, so let's check for
that instead.
---

diff --git a/unix/vncserver b/unix/vncserver
index c4d05359..a4d6ad93 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -38,8 +38,6 @@ if($slashndx>=0) {
 
 $vncClasses = "";
 
-$xauth = "xauth";
-
 &SanityCheck();
 
 #
@@ -793,7 +791,7 @@ sub SanityCheck
     #
 
  cmd:
-    foreach $cmd ("uname") {
+    foreach $cmd ("uname","xauth") {
 	for (split(/:/,$ENV{PATH})) {
 	    if (-x "$_/$cmd") {
 		next cmd;
@@ -801,20 +799,6 @@ sub SanityCheck
 	}
 	die "$prog: couldn't find \"$cmd\" on your PATH.\n";
     }
-    if (-x "/usr/X11R6/bin/xauth") {
-	$xauth = "/usr/X11R6/bin/xauth";
-    }
-    else {
-      cmd1:
-	foreach $cmd ("xauth") {
-	    for (split(/:/,$ENV{PATH})) {
-		if (-x "$_/$cmd") {
-		    next cmd1;
-		}
-	    }
-	    die "$prog: couldn't find \"$cmd\" on your PATH.\n";
-	}
-    }
 
     if($exedir eq "") {
       cmd2: