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 /scp.0 | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'scp.0')
-rw-r--r-- | scp.0 | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -89,6 +89,7 @@ DESCRIPTION | |||
89 | NoHostAuthenticationForLocalhost | 89 | NoHostAuthenticationForLocalhost |
90 | NumberOfPasswordPrompts | 90 | NumberOfPasswordPrompts |
91 | PasswordAuthentication | 91 | PasswordAuthentication |
92 | PKCS11Provider | ||
92 | Port | 93 | Port |
93 | PreferredAuthentications | 94 | PreferredAuthentications |
94 | Protocol | 95 | Protocol |
@@ -100,7 +101,6 @@ DESCRIPTION | |||
100 | SendEnv | 101 | SendEnv |
101 | ServerAliveInterval | 102 | ServerAliveInterval |
102 | ServerAliveCountMax | 103 | ServerAliveCountMax |
103 | SmartcardDevice | ||
104 | StrictHostKeyChecking | 104 | StrictHostKeyChecking |
105 | TCPKeepAlive | 105 | TCPKeepAlive |
106 | UsePrivilegedPort | 106 | UsePrivilegedPort |
@@ -145,4 +145,4 @@ AUTHORS | |||
145 | Timo Rinne <tri@iki.fi> | 145 | Timo Rinne <tri@iki.fi> |
146 | Tatu Ylonen <ylo@cs.hut.fi> | 146 | Tatu Ylonen <ylo@cs.hut.fi> |
147 | 147 | ||
148 | OpenBSD 4.6 July 12, 2008 3 | 148 | OpenBSD 4.6 February 8, 2010 3 |