diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-01-22 07:31:27 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-22 18:34:01 +1100 |
| commit | 8d3af6ebdf524b34087a0a3ae415b5141ba10572 (patch) | |
| tree | 18c46d177b0a204cc30cfe178ebc330e9eded597 /regress | |
| parent | 6c30c9adbeeed09a8a9e7a69974cfa1f1ddd1e9e (diff) | |
upstream: Increase keyscan timeout from default. On slow hosts 3
concurrent keyscans can hit the default 5 second timeout, so increase to 15
seconds.
OpenBSD-Regress-ID: 16383dec166af369b7fb9948572856f5d544c93f
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/keyscan.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/keyscan.sh b/regress/keyscan.sh index b8593fede..75a14ee0e 100644 --- a/regress/keyscan.sh +++ b/regress/keyscan.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: keyscan.sh,v 1.12 2019/12/16 02:39:05 djm Exp $ | 1 | # $OpenBSD: keyscan.sh,v 1.13 2020/01/22 07:31:27 dtucker Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="keyscan" | 4 | tid="keyscan" |
| @@ -16,7 +16,7 @@ start_sshd | |||
| 16 | 16 | ||
| 17 | for t in $SSH_KEYTYPES; do | 17 | for t in $SSH_KEYTYPES; do |
| 18 | trace "keyscan type $t" | 18 | trace "keyscan type $t" |
| 19 | ${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \ | 19 | ${SSHKEYSCAN} -t $t -T 15 -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \ |
| 20 | > /dev/null 2>&1 | 20 | > /dev/null 2>&1 |
| 21 | r=$? | 21 | r=$? |
| 22 | if [ $r -ne 0 ]; then | 22 | if [ $r -ne 0 ]; then |