]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Increase keyscan timeout from default. On slow hosts 3
authordtucker@openbsd.org <dtucker@openbsd.org>
Wed, 22 Jan 2020 07:31:27 +0000 (07:31 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 22 Jan 2020 07:34:01 +0000 (18:34 +1100)
concurrent keyscans can hit the default 5 second timeout, so increase to 15
seconds.

OpenBSD-Regress-ID: 16383dec166af369b7fb9948572856f5d544c93f

regress/keyscan.sh

index b8593fede8f32cf57338a0e8abc97add9ae9ed91..75a14ee0eecb2dca90a2fd7f72544b0a7416270d 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: keyscan.sh,v 1.12 2019/12/16 02:39:05 djm Exp $
+#      $OpenBSD: keyscan.sh,v 1.13 2020/01/22 07:31:27 dtucker Exp $
 #      Placed in the Public Domain.
 
 tid="keyscan"
@@ -16,7 +16,7 @@ start_sshd
 
 for t in $SSH_KEYTYPES; do
        trace "keyscan type $t"
-       ${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \
+       ${SSHKEYSCAN} -t $t -T 15 -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \
                > /dev/null 2>&1
        r=$?
        if [ $r -ne 0 ]; then