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 c4d0535994e3f86ca1331f13b55d3ef84a4062a3..a4d6ad939da68cb37cc40ac23d7d28fa5038826d 100755 (executable)
--- 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: