summaryrefslogtreecommitdiff
path: root/regress/test-exec.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-16 20:22:22 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-16 20:22:22 +1000
commite7d0583f36d060d199c44cbd16b367b0b9907333 (patch)
tree04070c413e33cb7ae0e555dcb4995943c44866bb /regress/test-exec.sh
parent50433a924344b295cd34ecdbba0c6b8f6add9231 (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.sh7
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
4PORT=4242 4PORT=4242
@@ -41,6 +41,7 @@ unset SSH_AUTH_SOCK
41# defaults 41# defaults
42SSH=ssh 42SSH=ssh
43SSHD=sshd 43SSHD=sshd
44SCP=scp
44SSHAGENT=ssh-agent 45SSHAGENT=ssh-agent
45SSHADD=ssh-add 46SSHADD=ssh-add
46SSHKEYGEN=ssh-keygen 47SSHKEYGEN=ssh-keygen
@@ -55,6 +56,9 @@ fi
55if [ "x$TEST_SSH_SSHD" != "x" ]; then 56if [ "x$TEST_SSH_SSHD" != "x" ]; then
56 SSHD="${TEST_SSH_SSHD}" 57 SSHD="${TEST_SSH_SSHD}"
57fi 58fi
59if [ "x$TEST_SSH_SCP" != "x" ]; then
60 SCP="${TEST_SSH_SCP}"
61fi
58if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then 62if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
59 SSHAGENT="${TEST_SSH_SSHAGENT}" 63 SSHAGENT="${TEST_SSH_SSHAGENT}"
60fi 64fi
@@ -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
172EOF 177EOF
173 178