summaryrefslogtreecommitdiffstats
path: root/ssh_config
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-16 03:39:04 +0200
committerDamien Miller <djm@mindrot.org>2003-05-16 03:39:04 +0200
commitb78d5eb6c58d54fb9972afe487ad94e63cc7d5c7 (patch)
tree8f40c7da74a5718e2d4c69919c2211049bcb0f77 /ssh_config
parent - markus@cvs.openbsd.org 2003/05/15 14:09:21 (diff)
downloadopenssh-b78d5eb6c58d54fb9972afe487ad94e63cc7d5c7.tar.xz
openssh-b78d5eb6c58d54fb9972afe487ad94e63cc7d5c7.zip
- djm@cvs.openbsd.org 2003/05/15 14:55:25
[readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c] add a ConnectTimeout option to ssh, based on patch from Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
Diffstat (limited to 'ssh_config')
-rw-r--r--ssh_config3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh_config b/ssh_config
index 94cffbf39..8a0acc17f 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
+# $OpenBSD: ssh_config,v 1.17 2003/05/15 14:55:25 djm Exp $
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
@@ -25,6 +25,7 @@
# HostbasedAuthentication no
# BatchMode no
# CheckHostIP yes
+# ConnectTimeout 0
# StrictHostKeyChecking ask
# IdentityFile ~/.ssh/identity
# IdentityFile ~/.ssh/id_rsa