diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-16 20:22:22 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-16 20:22:22 +1000 |
commit | e7d0583f36d060d199c44cbd16b367b0b9907333 (patch) | |
tree | 04070c413e33cb7ae0e555dcb4995943c44866bb /regress/test-exec.sh | |
parent | 50433a924344b295cd34ecdbba0c6b8f6add9231 (diff) |
- djm@cvs.openbsd.org 2004/06/13 15:04:08
[regress/Makefile regress/test-exec.sh, added regress/multiplex.sh]
regress test for client multiplexing; ok markus@
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index c8827b631..1f7e38d6a 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.17 2004/06/13 13:51:02 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.18 2004/06/13 15:04:08 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | PORT=4242 | 4 | PORT=4242 |
@@ -41,6 +41,7 @@ unset SSH_AUTH_SOCK | |||
41 | # defaults | 41 | # defaults |
42 | SSH=ssh | 42 | SSH=ssh |
43 | SSHD=sshd | 43 | SSHD=sshd |
44 | SCP=scp | ||
44 | SSHAGENT=ssh-agent | 45 | SSHAGENT=ssh-agent |
45 | SSHADD=ssh-add | 46 | SSHADD=ssh-add |
46 | SSHKEYGEN=ssh-keygen | 47 | SSHKEYGEN=ssh-keygen |
@@ -55,6 +56,9 @@ fi | |||
55 | if [ "x$TEST_SSH_SSHD" != "x" ]; then | 56 | if [ "x$TEST_SSH_SSHD" != "x" ]; then |
56 | SSHD="${TEST_SSH_SSHD}" | 57 | SSHD="${TEST_SSH_SSHD}" |
57 | fi | 58 | fi |
59 | if [ "x$TEST_SSH_SCP" != "x" ]; then | ||
60 | SCP="${TEST_SSH_SCP}" | ||
61 | fi | ||
58 | if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then | 62 | if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then |
59 | SSHAGENT="${TEST_SSH_SSHAGENT}" | 63 | SSHAGENT="${TEST_SSH_SSHAGENT}" |
60 | fi | 64 | fi |
@@ -168,6 +172,7 @@ cat << EOF > $OBJ/sshd_config | |||
168 | LogLevel QUIET | 172 | LogLevel QUIET |
169 | AcceptEnv _XXX_TEST_* | 173 | AcceptEnv _XXX_TEST_* |
170 | AcceptEnv _XXX_TEST | 174 | AcceptEnv _XXX_TEST |
175 | Subsystem sftp $SFTPSERVER | ||
171 | StrictModes no | 176 | StrictModes no |
172 | EOF | 177 | EOF |
173 | 178 | ||