From 6fb10a5ab10291b39fb5a141e8de969a1ef8ae75 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@cvs.openbsd.org>
Date: Mon, 6 Dec 2004 10:49:57 +0000
Subject: Check if TEST_SSH_SSHD is a full path to sshd before searching; ok
 markus@

---
 regress/usr.bin/ssh/test-exec.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'regress/usr.bin/ssh')

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
-- 
cgit v1.2.3