diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/test-exec.sh | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -14,6 +14,9 @@ | |||
14 | [sftp-client.c] | 14 | [sftp-client.c] |
15 | d_type isn't portable so use lstat to get dirent modes. Suggested by and | 15 | d_type isn't portable so use lstat to get dirent modes. Suggested by and |
16 | "looks sane" deraadt@ | 16 | "looks sane" deraadt@ |
17 | - markus@cvs.openbsd.org 2009/10/08 18:04:27 | ||
18 | [regress/test-exec.sh] | ||
19 | re-enable protocol v1 for the tests. | ||
17 | 20 | ||
18 | 20091007 | 21 | 20091007 |
19 | - (dtucker) OpenBSD CVS Sync | 22 | - (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 @@ | |||
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 |