diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
| commit | 8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (patch) | |
| tree | e6cb74192adb00fda5e4d1457547851d7e0d86af /ssh_config | |
| parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) | |
| parent | c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff) | |
merge 6.3p1
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 2c06ba707..32343213f 100644 --- a/ssh_config +++ b/ssh_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $ | 1 | # $OpenBSD: ssh_config,v 1.27 2013/05/16 02:00:34 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 |
| @@ -47,3 +47,4 @@ | |||
| 47 | # PermitLocalCommand no | 47 | # PermitLocalCommand no |
| 48 | # VisualHostKey no | 48 | # VisualHostKey no |
| 49 | # ProxyCommand ssh -q -W %h:%p gateway.example.com | 49 | # ProxyCommand ssh -q -W %h:%p gateway.example.com |
| 50 | # RekeyLimit 1G 1h | ||