- markus@cvs.openbsd.org 2009/10/08 18:04:27

     [regress/test-exec.sh]
     re-enable protocol v1 for the tests.

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 41bf68e7c..918a48da1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
      [sftp-client.c]
      d_type isn't portable so use lstat to get dirent modes.  Suggested by and
      "looks sane" deraadt@
+   - markus@cvs.openbsd.org 2009/10/08 18:04:27
+     [regress/test-exec.sh]
+     re-enable protocol v1 for the tests.
 
 20091007
  - (dtucker) OpenBSD CVS Sync
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b54448912..804a29696 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $
+#       $OpenBSD: test-exec.sh,v 1.36 2009/10/08 18:04:27 markus Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -222,6 +222,7 @@ trap fatal 3 2
 cat << EOF > $OBJ/sshd_config
         StrictModes             no
         Port                    $PORT
+        Protocol                2,1
         AddressFamily           inet
         ListenAddress           127.0.0.1
         #ListenAddress          ::1
@@ -247,6 +248,7 @@ echo 'StrictModes no' >> $OBJ/sshd_proxy
 # create client config
 cat << EOF > $OBJ/ssh_config
 Host *
+        Protocol                2,1
         Hostname                127.0.0.1
         HostKeyAlias            localhost-with-alias
         Port                    $PORT