diff options
| author |   djm <djm@openbsd.org> | 2019-09-13 04:07:42 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-09-13 04:07:42 +0000 |
| commit | 0bd5555b7f0ac086bd21aecaddf5ef9498fe0ce5 (patch) | |
| tree | 47d48674ce4962fc617cee00aee8f2cf98377b90 /usr.bin | |
| parent | avoid the use of a custom bpf copy function. (diff) | |
| download | wireguard-openbsd-0bd5555b7f0ac086bd21aecaddf5ef9498fe0ce5.tar.xz wireguard-openbsd-0bd5555b7f0ac086bd21aecaddf5ef9498fe0ce5.zip | |
clarify that ConnectTimeout applies both to the TCP connection and to
the protocol handshake/KEX. From Jean-Charles Longuet via Github PR140
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index 894e1bea830..949e138b136 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/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 |