diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /scp.0 | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'scp.0')
-rw-r--r-- | scp.0 | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -73,6 +73,7 @@ DESCRIPTION | |||
73 | GlobalKnownHostsFile | 73 | GlobalKnownHostsFile |
74 | GSSAPIAuthentication | 74 | GSSAPIAuthentication |
75 | GSSAPIDelegateCredentials | 75 | GSSAPIDelegateCredentials |
76 | HashKnownHosts | ||
76 | Host | 77 | Host |
77 | HostbasedAuthentication | 78 | HostbasedAuthentication |
78 | HostKeyAlgorithms | 79 | HostKeyAlgorithms |
@@ -80,6 +81,7 @@ DESCRIPTION | |||
80 | HostName | 81 | HostName |
81 | IdentityFile | 82 | IdentityFile |
82 | IdentitiesOnly | 83 | IdentitiesOnly |
84 | KbdInteractiveDevices | ||
83 | LogLevel | 85 | LogLevel |
84 | MACs | 86 | MACs |
85 | NoHostAuthenticationForLocalhost | 87 | NoHostAuthenticationForLocalhost |