summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-16 20:31:18 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-16 20:31:18 +1000
commita40395663c675c3946dfa5ffe7bec84a1b38ab2a (patch)
tree2c2c8d745405d19507af311fb0f614be31f79899
parente7d0583f36d060d199c44cbd16b367b0b9907333 (diff)
- djm@cvs.openbsd.org 2004/06/13 15:16:54
[regress/test-exec.sh] remove duplicate setting of $SCP; spotted by markus@
-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 e93749ed..ebf3e1d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- djm@cvs.openbsd.org 2004/06/13 15:04:08
[Makefile test-exec.sh]
regress test for client multiplexing; ok markus@
+ - djm@cvs.openbsd.org 2004/06/13 15:16:54
+ [regress/test-exec.sh]
+ remove duplicate setting of $SCP; spotted by markus@
20040615
- (djm) OpenBSD CVS Sync
@@ -1237,4 +1240,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3391 2004/06/16 10:22:22 dtucker Exp $
+$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 1f7e38d6..e0ce8813 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.18 2004/06/13 15:04:08 djm Exp $
+# $OpenBSD: test-exec.sh,v 1.19 2004/06/13 15:16:54 djm Exp $
# Placed in the Public Domain.
PORT=4242
@@ -41,7 +41,6 @@ unset SSH_AUTH_SOCK
# defaults
SSH=ssh
SSHD=sshd
-SCP=scp
SSHAGENT=ssh-agent
SSHADD=ssh-add
SSHKEYGEN=ssh-keygen
@@ -56,9 +55,6 @@ 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