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 c4d0535..a4d6ad9 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -38,8 +38,6 @@
$vncClasses = "";
-$xauth = "xauth";
-
&SanityCheck();
#
@@ -793,7 +791,7 @@
#
cmd:
- foreach $cmd ("uname") {
+ foreach $cmd ("uname","xauth") {
for (split(/:/,$ENV{PATH})) {
if (-x "$_/$cmd") {
next cmd;
@@ -801,20 +799,6 @@
}
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: