summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/multiplex.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 04086429e..95b583e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
14 Add small description of failing test to failure message; ok djm@ 14 Add small description of failing test to failure message; ok djm@
15 - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need 15 - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need
16 it. 16 it.
17 - (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec (60 is not
18 enough for slow systems, especially if they don't have a kernel RNG).
17 19
1820040616 2020040616
19 - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No 21 - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1268,4 +1270,4 @@
1268 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1270 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1269 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1271 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1270 1272
1271$Id: ChangeLog,v 1.3403 2004/06/17 06:36:27 dtucker Exp $ 1273$Id: ChangeLog,v 1.3404 2004/06/17 07:01:21 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 654aae5e6..8605d5e0b 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -11,7 +11,7 @@ COPY=$OBJ/ls.copy
11start_sshd 11start_sshd
12 12
13trace "start master, fork to background" 13trace "start master, fork to background"
14${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60 14${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 120
15 15
16rm -f ${COPY} 16rm -f ${COPY}
17trace "ssh transfer over multiplexed connection and check result" 17trace "ssh transfer over multiplexed connection and check result"