summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2009-10-08 18:04:28 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2009-10-08 18:04:28 +0000
commit6aeaf9f8180b63242e0efdc9aee27bd44578647d (patch)
tree8aa70e78d558edd3661fb18bad3543fb109ad094 /regress/usr.bin
parent3ceb92d1cb14ed2b641bc670d1b097d7d87c15f2 (diff)
re-enable protocol v1 for the tests.
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/ssh/test-exec.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index 94a702eca85..ade81eee939 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.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.
USER=`id -un`
@@ -162,6 +162,7 @@ trap fatal 3 2
# create server config
cat << EOF > $OBJ/sshd_config
Port $PORT
+ Protocol 2,1
AddressFamily inet
ListenAddress 127.0.0.1
#ListenAddress ::1
@@ -187,6 +188,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