diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /ssh_config | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'ssh_config')
-rw-r--r-- | ssh_config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh_config b/ssh_config index 94cffbf39..2692e8913 100644 --- a/ssh_config +++ b/ssh_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $ | 1 | # $OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus 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 |
@@ -18,13 +18,14 @@ | |||
18 | # Host * | 18 | # Host * |
19 | # ForwardAgent no | 19 | # ForwardAgent no |
20 | # ForwardX11 no | 20 | # ForwardX11 no |
21 | # RhostsAuthentication no | ||
22 | # RhostsRSAAuthentication no | 21 | # RhostsRSAAuthentication no |
23 | # RSAAuthentication yes | 22 | # RSAAuthentication yes |
24 | # PasswordAuthentication yes | 23 | # PasswordAuthentication yes |
25 | # HostbasedAuthentication no | 24 | # HostbasedAuthentication no |
26 | # BatchMode no | 25 | # BatchMode no |
27 | # CheckHostIP yes | 26 | # CheckHostIP yes |
27 | # AddressFamily any | ||
28 | # ConnectTimeout 0 | ||
28 | # StrictHostKeyChecking ask | 29 | # StrictHostKeyChecking ask |
29 | # IdentityFile ~/.ssh/identity | 30 | # IdentityFile ~/.ssh/identity |
30 | # IdentityFile ~/.ssh/id_rsa | 31 | # IdentityFile ~/.ssh/id_rsa |