diff options
| author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
| commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
| tree | f64a4ace625514e94759878c0b94ab0a79805bbd /ssh_config | |
| parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
| parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) | |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'ssh_config')
| -rw-r--r-- | ssh_config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh_config b/ssh_config index 0510f347c..a3cac0e4e 100644 --- a/ssh_config +++ b/ssh_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $ | 1 | # $OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk 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 |
| @@ -38,5 +38,8 @@ Host * | |||
| 38 | # Cipher 3des | 38 | # Cipher 3des |
| 39 | # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc | 39 | # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc |
| 40 | # EscapeChar ~ | 40 | # EscapeChar ~ |
| 41 | # Tunnel no | ||
| 42 | # TunnelDevice any:any | ||
| 43 | # PermitLocalCommand no | ||
| 41 | SendEnv LANG LC_* | 44 | SendEnv LANG LC_* |
| 42 | HashKnownHosts yes | 45 | HashKnownHosts yes |