summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2004-12-06 10:49:57 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2004-12-06 10:49:57 +0000
commit6fb10a5ab10291b39fb5a141e8de969a1ef8ae75 (patch)
tree4f5367f8817b1c1f54f309a6d85446c338a9a453
parent269cea73ba31695dbc3e073cfba893f37912bb99 (diff)
Check if TEST_SSH_SSHD is a full path to sshd before searching; ok markus@
-rw-r--r--regress/usr.bin/ssh/test-exec.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index 458aecfd462..c5a00fc1798 100644
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.24 2004/11/25 09:39:27 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.25 2004/12/06 10:49:56 dtucker Exp $
# Placed in the Public Domain.
USER=`id -un`
@@ -77,7 +77,9 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then
fi
# Path to sshd must be absolute for rexec
-SSHD=`which sshd`
+if [ ! -x /$SSHD ]; then
+ SSHD=`which sshd`
+fi
# these should be used in tests
export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP