diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
commit | eab78da6a54225de06271d9c8da650f04a55ed88 (patch) | |
tree | aa258ca77515939f6d89317ff67fbcb0bca08b24 /ssh_config.5 | |
parent | a26f5de49df59322fde07f7be91b3e3969c9c238 (diff) | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs.
- Allow "PermitOpen none" to refuse all port-forwarding requests
(closes: #543683).
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index cfb11d64a..9d4b38aa8 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $ |
37 | .Dd $Mdocdate: September 9 2011 $ | 37 | .Dd $Mdocdate: June 29 2012 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -668,7 +668,7 @@ offers many different identities. | |||
668 | The default is | 668 | The default is |
669 | .Dq no . | 669 | .Dq no . |
670 | .It Cm IdentityFile | 670 | .It Cm IdentityFile |
671 | Specifies a file from which the user's DSA, ECDSA or DSA authentication | 671 | Specifies a file from which the user's DSA, ECDSA or RSA authentication |
672 | identity is read. | 672 | identity is read. |
673 | The default is | 673 | The default is |
674 | .Pa ~/.ssh/identity | 674 | .Pa ~/.ssh/identity |
@@ -849,9 +849,8 @@ Multiple algorithms must be comma-separated. | |||
849 | The default is: | 849 | The default is: |
850 | .Bd -literal -offset indent | 850 | .Bd -literal -offset indent |
851 | hmac-md5,hmac-sha1,umac-64@openssh.com, | 851 | hmac-md5,hmac-sha1,umac-64@openssh.com, |
852 | hmac-ripemd160,hmac-sha1-96,hmac-md5-96, | 852 | hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, |
853 | hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512, | 853 | hmac-sha1-96,hmac-md5-96 |
854 | hmac-sha2-512-96 | ||
855 | .Ed | 854 | .Ed |
856 | .It Cm NoHostAuthenticationForLocalhost | 855 | .It Cm NoHostAuthenticationForLocalhost |
857 | This option can be used if the home directory is shared across machines. | 856 | This option can be used if the home directory is shared across machines. |