summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regress/test-exec.sh6
2 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e93749ed6..ebf3e1d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - djm@cvs.openbsd.org 2004/06/13 15:04:08 12 - djm@cvs.openbsd.org 2004/06/13 15:04:08
13 [Makefile test-exec.sh] 13 [Makefile test-exec.sh]
14 regress test for client multiplexing; ok markus@ 14 regress test for client multiplexing; ok markus@
15 - djm@cvs.openbsd.org 2004/06/13 15:16:54
16 [regress/test-exec.sh]
17 remove duplicate setting of $SCP; spotted by markus@
15 18
1620040615 1920040615
17 - (djm) OpenBSD CVS Sync 20 - (djm) OpenBSD CVS Sync
@@ -1237,4 +1240,4 @@
1237 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1240 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1238 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1241 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1239 1242
1240$Id: ChangeLog,v 1.3391 2004/06/16 10:22:22 dtucker Exp $ 1243$Id: ChangeLog,v 1.3392 2004/06/16 10:31:18 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 1f7e38d6a..e0ce88138 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: test-exec.sh,v 1.18 2004/06/13 15:04:08 djm Exp $ 1# $OpenBSD: test-exec.sh,v 1.19 2004/06/13 15:16:54 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4PORT=4242 4PORT=4242
@@ -41,7 +41,6 @@ unset SSH_AUTH_SOCK
41# defaults 41# defaults
42SSH=ssh 42SSH=ssh
43SSHD=sshd 43SSHD=sshd
44SCP=scp
45SSHAGENT=ssh-agent 44SSHAGENT=ssh-agent
46SSHADD=ssh-add 45SSHADD=ssh-add
47SSHKEYGEN=ssh-keygen 46SSHKEYGEN=ssh-keygen
@@ -56,9 +55,6 @@ fi
56if [ "x$TEST_SSH_SSHD" != "x" ]; then 55if [ "x$TEST_SSH_SSHD" != "x" ]; then
57 SSHD="${TEST_SSH_SSHD}" 56 SSHD="${TEST_SSH_SSHD}"
58fi 57fi
59if [ "x$TEST_SSH_SCP" != "x" ]; then
60 SCP="${TEST_SSH_SCP}"
61fi
62if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then 58if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
63 SSHAGENT="${TEST_SSH_SSHAGENT}" 59 SSHAGENT="${TEST_SSH_SSHAGENT}"
64fi 60fi