diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-12-06 23:16:29 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-12-06 23:16:29 +1100 |
commit | d028fea13a24c2728e00bba98e7ff73a0470792d (patch) | |
tree | 85b928b32bd00999a8dac67cfff9861837c884e8 /regress/test-exec.sh | |
parent | cc0603d4b6421fa3ce23c273bc254f5dd0a6f0f6 (diff) |
- 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@
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 4e69658ce..a57e46e59 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.24 2004/11/25 09:39:27 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.25 2004/12/06 10:49:56 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -83,7 +83,9 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then | |||
83 | fi | 83 | fi |
84 | 84 | ||
85 | # Path to sshd must be absolute for rexec | 85 | # Path to sshd must be absolute for rexec |
86 | SSHD=`which sshd` | 86 | if [ ! -x /$SSHD ]; then |
87 | SSHD=`which sshd` | ||
88 | fi | ||
87 | 89 | ||
88 | # these should be used in tests | 90 | # these should be used in tests |
89 | export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP | 91 | export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP |