diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
commit | a25ec0b132c44c9e341e08464ff830de06b81126 (patch) | |
tree | e20842d80f9e25cb6cf09525abea63f7bf655dd7 /ssh_config.5 | |
parent | 1b816ea846aca3ee89e7995373ace609e9518424 (diff) | |
parent | 70847d299887abb96f8703ca99db6d817b78960e (diff) |
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 83de2f7e4..53596e63a 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,8 +34,8 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.98 2007/01/10 13:23:22 jmc Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.102 2007/08/15 12:13:41 stevesk Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd $Mdocdate: August 15 2007 $ |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -387,7 +387,7 @@ data). | |||
387 | Specifies whether | 387 | Specifies whether |
388 | .Xr ssh 1 | 388 | .Xr ssh 1 |
389 | should terminate the connection if it cannot set up all requested | 389 | should terminate the connection if it cannot set up all requested |
390 | dynamic, local, and remote port forwardings. | 390 | dynamic, tunnel, local, and remote port forwardings. |
391 | The argument must be | 391 | The argument must be |
392 | .Dq yes | 392 | .Dq yes |
393 | or | 393 | or |
@@ -658,7 +658,10 @@ The MAC algorithm is used in protocol version 2 | |||
658 | for data integrity protection. | 658 | for data integrity protection. |
659 | Multiple algorithms must be comma-separated. | 659 | Multiple algorithms must be comma-separated. |
660 | The default is: | 660 | The default is: |
661 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . | 661 | .Bd -literal -offset indent |
662 | hmac-md5,hmac-sha1,umac-64@openssh.com, | ||
663 | hmac-ripemd160,hmac-sha1-96,hmac-md5-96 | ||
664 | .Ed | ||
662 | .It Cm NoHostAuthenticationForLocalhost | 665 | .It Cm NoHostAuthenticationForLocalhost |
663 | This option can be used if the home directory is shared across machines. | 666 | This option can be used if the home directory is shared across machines. |
664 | In this case localhost will refer to a different machine on each of | 667 | In this case localhost will refer to a different machine on each of |