diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
| commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
| tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /ssh_config | |
| parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
| parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) | |
merge 5.4p1
Diffstat (limited to 'ssh_config')
| -rw-r--r-- | ssh_config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh_config b/ssh_config index 93a28014b..2c06ba707 100644 --- a/ssh_config +++ b/ssh_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $ | 1 | # $OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $ |
| 2 | 2 | ||
| 3 | # This is the ssh client system-wide configuration file. See | 3 | # This is the ssh client system-wide configuration file. See |
| 4 | # ssh_config(5) for more information. This file provides defaults for | 4 | # ssh_config(5) for more information. This file provides defaults for |
| @@ -46,3 +46,4 @@ | |||
| 46 | # TunnelDevice any:any | 46 | # TunnelDevice any:any |
| 47 | # PermitLocalCommand no | 47 | # PermitLocalCommand no |
| 48 | # VisualHostKey no | 48 | # VisualHostKey no |
| 49 | # ProxyCommand ssh -q -W %h:%p gateway.example.com | ||