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 @@
    - 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 1f7e38d6a..e0ce88138 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