summaryrefslogtreecommitdiff
path: root/regress/usr.bin/ssh/test-exec.sh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2004-06-13 15:04:09 +0000
committerDamien Miller <djm@cvs.openbsd.org>2004-06-13 15:04:09 +0000
commit35182960af462ade57bf55c41c878b6578567a52 (patch)
tree9984ebc9a8d2465ed09993b7e5fb1586fb013929 /regress/usr.bin/ssh/test-exec.sh
parent0d912f1959a05f98ebdbe6fcb1a4342c3b06196c (diff)
regress test for client multiplexing; ok markus@
Diffstat (limited to 'regress/usr.bin/ssh/test-exec.sh')
-rw-r--r--regress/usr.bin/ssh/test-exec.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index 15bc83b7c23..dc169849f8e 100644
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.17 2004/06/13 13:51:02 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.18 2004/06/13 15:04:08 djm Exp $
# Placed in the Public Domain.
PORT=4242
@@ -35,6 +35,7 @@ unset SSH_AUTH_SOCK
# defaults
SSH=ssh
SSHD=sshd
+SCP=scp
SSHAGENT=ssh-agent
SSHADD=ssh-add
SSHKEYGEN=ssh-keygen
@@ -49,6 +50,9 @@ fi
if [ "x$TEST_SSH_SSHD" != "x" ]; then
SSHD="${TEST_SSH_SSHD}"
fi
+if [ "x$TEST_SSH_SCP" != "x" ]; then
+ SCP="${TEST_SSH_SCP}"
+fi
if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
SSHAGENT="${TEST_SSH_SSHAGENT}"
fi
@@ -136,6 +140,7 @@ cat << EOF > $OBJ/sshd_config
LogLevel QUIET
AcceptEnv _XXX_TEST_*
AcceptEnv _XXX_TEST
+ Subsystem sftp $SFTPSERVER
EOF
# server config for proxy connects