summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/test-exec.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 09203eca3..0d8c0719a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120040616 120040616
2 - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No 2 - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
3 code changes. 3 code changes.
4 - (dtucker) [regress/test-exec.sh]
5 Move Portable-only StrictModes to top of list to make syncs easier.
4 - (dtucker) OpenBSD CVS Sync regress/ 6 - (dtucker) OpenBSD CVS Sync regress/
5 - djm@cvs.openbsd.org 2004/04/27 09:47:30 7 - djm@cvs.openbsd.org 2004/04/27 09:47:30
6 [regress/Makefile regress/test-exec.sh, added regress/envpass.sh] 8 [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
@@ -1241,4 +1243,4 @@
1241 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1243 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1242 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1244 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1243 1245
1244$Id: ChangeLog,v 1.3393 2004/06/16 10:33:55 dtucker Exp $ 1246$Id: ChangeLog,v 1.3394 2004/06/16 10:36:16 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e0ce88138..296f26eb3 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -160,6 +160,7 @@ trap fatal 3 2
160 160
161# create server config 161# create server config
162cat << EOF > $OBJ/sshd_config 162cat << EOF > $OBJ/sshd_config
163 StrictModes no
163 Port $PORT 164 Port $PORT
164 ListenAddress 127.0.0.1 165 ListenAddress 127.0.0.1
165 #ListenAddress ::1 166 #ListenAddress ::1
@@ -169,7 +170,6 @@ cat << EOF > $OBJ/sshd_config
169 AcceptEnv _XXX_TEST_* 170 AcceptEnv _XXX_TEST_*
170 AcceptEnv _XXX_TEST 171 AcceptEnv _XXX_TEST
171 Subsystem sftp $SFTPSERVER 172 Subsystem sftp $SFTPSERVER
172 StrictModes no
173EOF 173EOF
174 174
175# server config for proxy connects 175# server config for proxy connects