diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/test-exec.sh | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -44,6 +44,9 @@ | |||
44 | - dtucker@cvs.openbsd.org 2004/11/25 09:39:27 | 44 | - dtucker@cvs.openbsd.org 2004/11/25 09:39:27 |
45 | [test-exec.sh] | 45 | [test-exec.sh] |
46 | Remove obsolete RhostsAuthentication from test config; ok markus@ | 46 | Remove obsolete RhostsAuthentication from test config; ok markus@ |
47 | - dtucker@cvs.openbsd.org 2004/12/06 10:49:56 | ||
48 | [test-exec.sh] | ||
49 | Check if TEST_SSH_SSHD is a full path to sshd before searching; ok markus@ | ||
47 | 50 | ||
48 | 20041203 | 51 | 20041203 |
49 | - (dtucker) OpenBSD CVS Sync | 52 | - (dtucker) OpenBSD CVS Sync |
@@ -1917,4 +1920,4 @@ | |||
1917 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1920 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1918 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1921 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1919 | 1922 | ||
1920 | $Id: ChangeLog,v 1.3597 2004/12/06 12:13:50 dtucker Exp $ | 1923 | $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 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 |