- 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@
diff --git a/ChangeLog b/ChangeLog
index 85591f0..162890e 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
@@ -1917,4 +1920,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3597 2004/12/06 12:13:50 dtucker Exp $
+$Id: ChangeLog,v 1.3598 2004/12/06 12:16:29 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 4e69658..a57e46e 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 @@
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