summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
committerColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
commit327155e6824b3ee13837bdde04e4eb47e147ff46 (patch)
tree8f8743122403c7a2e6ed919156711fb1520c657f /ssh_config.5
parent0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff)
parent74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff)
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget" command and on the sftp commandline or on the "get" commandline using the "-a" (append) option (closes: #158590). - ssh(1): add an "IgnoreUnknown" configuration option to selectively suppress errors arising from unknown configuration directives (closes: #436052). - sftp(1): update progressmeter when data is acknowledged, not when it's sent (partially addresses #708372). - ssh(1): do not fatally exit when attempting to cleanup multiplexing- created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'ssh_config.5')
-rw-r--r--ssh_config.546
1 files changed, 36 insertions, 10 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index fa852acb1..127540a60 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.161 2013/01/08 18:49:04 markus Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.166 2013/06/27 14:05:37 jmc Exp $
37.Dd $Mdocdate: January 8 2013 $ 37.Dd $Mdocdate: June 27 2013 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -494,8 +494,7 @@ option is also enabled.
494.It Cm ForwardX11Timeout 494.It Cm ForwardX11Timeout
495Specify a timeout for untrusted X11 forwarding 495Specify a timeout for untrusted X11 forwarding
496using the format described in the 496using the format described in the
497.Sx TIME FORMATS 497TIME FORMATS section of
498section of
499.Xr sshd_config 5 . 498.Xr sshd_config 5 .
500X11 connections received by 499X11 connections received by
501.Xr ssh 1 500.Xr ssh 1
@@ -684,7 +683,9 @@ and
684.Pa ~/.ssh/id_rsa 683.Pa ~/.ssh/id_rsa
685for protocol version 2. 684for protocol version 2.
686Additionally, any identities represented by the authentication agent 685Additionally, any identities represented by the authentication agent
687will be used for authentication. 686will be used for authentication unless
687.Cm IdentitiesOnly
688is set.
688.Xr ssh 1 689.Xr ssh 1
689will try to load certificate information from the filename obtained by 690will try to load certificate information from the filename obtained by
690appending 691appending
@@ -713,6 +714,22 @@ Multiple
713.Cm IdentityFile 714.Cm IdentityFile
714directives will add to the list of identities tried (this behaviour 715directives will add to the list of identities tried (this behaviour
715differs from that of other configuration directives). 716differs from that of other configuration directives).
717.Pp
718.Cm IdentityFile
719may be used in conjunction with
720.Cm IdentitiesOnly
721to select which identities in an agent are offered during authentication.
722.It Cm IgnoreUnknown
723Specifies a pattern-list of unknown options to be ignored if they are
724encountered in configuration parsing.
725This may be used to suppress errors if
726.Nm
727contains options that are unrecognised by
728.Xr ssh 1 .
729It is recommended that
730.Cm IgnoreUnknown
731be listed early in the configuration file as it will not be applied
732to unknown options that appear before it.
716.It Cm IPQoS 733.It Cm IPQoS
717Specifies the IPv4 type-of-service or DSCP class for connections. 734Specifies the IPv4 type-of-service or DSCP class for connections.
718Accepted values are 735Accepted values are
@@ -987,8 +1004,9 @@ The default is
987This option applies to protocol version 2 only. 1004This option applies to protocol version 2 only.
988.It Cm RekeyLimit 1005.It Cm RekeyLimit
989Specifies the maximum amount of data that may be transmitted before the 1006Specifies the maximum amount of data that may be transmitted before the
990session key is renegotiated. 1007session key is renegotiated, optionally followed a maximum amount of
991The argument is the number of bytes, with an optional suffix of 1008time that may pass before the session key is renegotiated.
1009The first argument is specified in bytes and may have a suffix of
992.Sq K , 1010.Sq K ,
993.Sq M , 1011.Sq M ,
994or 1012or
@@ -999,6 +1017,16 @@ The default is between
999and 1017and
1000.Sq 4G , 1018.Sq 4G ,
1001depending on the cipher. 1019depending on the cipher.
1020The optional second value is specified in seconds and may use any of the
1021units documented in the
1022TIME FORMATS section of
1023.Xr sshd_config 5 .
1024The default value for
1025.Cm RekeyLimit
1026is
1027.Dq default none ,
1028which means that rekeying is performed after the cipher's default amount
1029of data has been sent or received and no time based rekeying is done.
1002This option applies to protocol version 2 only. 1030This option applies to protocol version 2 only.
1003.It Cm RemoteForward 1031.It Cm RemoteForward
1004Specifies that a TCP port on the remote machine be forwarded over 1032Specifies that a TCP port on the remote machine be forwarded over
@@ -1310,9 +1338,7 @@ The default is
1310.Dq no . 1338.Dq no .
1311Note that this option applies to protocol version 2 only. 1339Note that this option applies to protocol version 2 only.
1312.Pp 1340.Pp
1313See also 1341See also VERIFYING HOST KEYS in
1314.Sx VERIFYING HOST KEYS
1315in
1316.Xr ssh 1 . 1342.Xr ssh 1 .
1317.It Cm VisualHostKey 1343.It Cm VisualHostKey
1318If this flag is set to 1344If this flag is set to