diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-09-13 04:07:42 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-09-13 14:09:21 +1000 |
| commit | 2ce1d11600e13bee0667d6b717ffcc18a057b821 (patch) | |
| tree | b02363f86a3a8daf808c2f45d0d37b2ed620b872 | |
| parent | df780114278f406ef7cb2278802a2660092fff09 (diff) | |
upstream: clarify that ConnectTimeout applies both to the TCP
connection and to the protocol handshake/KEX. From Jean-Charles Longuet via
Github PR140
OpenBSD-Commit-ID: ce1766abc6da080f0d88c09c2c5585a32b2256bf
| -rw-r--r-- | ssh_config.5 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index e114b1df..b10c5549 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.301 2019/09/06 14:45:34 naddy Exp $ -.Dd $Mdocdate: September 6 2019 $ +.\" $OpenBSD: ssh_config.5,v 1.302 2019/09/13 04:07:42 djm Exp $ +.Dd $Mdocdate: September 13 2019 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -489,8 +489,8 @@ The default is 1. .It Cm ConnectTimeout Specifies the timeout (in seconds) used when connecting to the SSH server, instead of using the default system TCP timeout. -This value is used only when the target is down or really unreachable, -not when it refuses the connection. +This timeout is applied both to establishing the connection and to performing +the initial SSH protocol handshake and key exchange. .It Cm ControlMaster Enables the sharing of multiple sessions over a single network connection. When set to |