diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-10-12 09:37:22 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-10-12 09:37:22 +1100 |
commit | e23a79cbed41a3d10533a9d5caefdcee058a066b (patch) | |
tree | e0213e8cf2372297414e8285bac4d43151a7f13e /regress | |
parent | 438b47320cf075fa51aa0e840882998c24db176b (diff) |
- markus@cvs.openbsd.org 2009/10/08 18:04:27
[regress/test-exec.sh]
re-enable protocol v1 for the tests.
Diffstat (limited to 'regress')
-rw-r--r-- | regress/test-exec.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.36 2009/10/08 18:04:27 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -222,6 +222,7 @@ trap fatal 3 2 | |||
222 | cat << EOF > $OBJ/sshd_config | 222 | cat << EOF > $OBJ/sshd_config |
223 | StrictModes no | 223 | StrictModes no |
224 | Port $PORT | 224 | Port $PORT |
225 | Protocol 2,1 | ||
225 | AddressFamily inet | 226 | AddressFamily inet |
226 | ListenAddress 127.0.0.1 | 227 | ListenAddress 127.0.0.1 |
227 | #ListenAddress ::1 | 228 | #ListenAddress ::1 |
@@ -247,6 +248,7 @@ echo 'StrictModes no' >> $OBJ/sshd_proxy | |||
247 | # create client config | 248 | # create client config |
248 | cat << EOF > $OBJ/ssh_config | 249 | cat << EOF > $OBJ/ssh_config |
249 | Host * | 250 | Host * |
251 | Protocol 2,1 | ||
250 | Hostname 127.0.0.1 | 252 | Hostname 127.0.0.1 |
251 | HostKeyAlias localhost-with-alias | 253 | HostKeyAlias localhost-with-alias |
252 | Port $PORT | 254 | Port $PORT |