From 185a020b45faa7cabdf9c9129e0654981fab915e Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Mon, 6 Dec 2004 12:16:29 +0000
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2004/12/06 10:49:56     
 [test-exec.sh]      Check if TEST_SSH_SSHD is a full path to sshd before
 searching; ok markus@

---
 ChangeLog            | 3 +++
 regress/test-exec.sh | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3361591b..a31351f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,9 @@
    - dtucker@cvs.openbsd.org 2004/11/25 09:39:27
      [test-exec.sh]
      Remove obsolete RhostsAuthentication from test config; ok markus@
+   - dtucker@cvs.openbsd.org 2004/12/06 10:49:56
+     [test-exec.sh]
+     Check if TEST_SSH_SSHD is a full path to sshd before searching; ok markus@
 
 20041203
  - (dtucker) OpenBSD CVS Sync
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 4e69658c..a57e46e5 100644
--- a/regress/test-exec.sh
+++ b/regress/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.
 
 #SUDO=sudo
@@ -83,7 +83,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
-- 
2.45.2