diff options
author | Damien Miller <djm@mindrot.org> | 2010-11-20 15:19:38 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-11-20 15:19:38 +1100 |
commit | 0dac6fb6b228a96f4ab3717e3d73871595a291a8 (patch) | |
tree | 7eae6f1e6a39fb7d608a05250f4749a77a914814 /ssh_config.5 | |
parent | 4499f4cc20eee7e0f67b35f5a5c6078bf07dcbc0 (diff) |
- djm@cvs.openbsd.org 2010/11/13 23:27:51
[clientloop.c misc.c misc.h packet.c packet.h readconf.c readconf.h]
[servconf.c servconf.h session.c ssh.c ssh_config.5 sshd_config.5]
allow ssh and sshd to set arbitrary TOS/DSCP/QoS values instead of
hardcoding lowdelay/throughput.
bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index dd39bfafb..9e82fa864 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.142 2010/10/28 18:33:28 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.143 2010/11/13 23:27:50 djm Exp $ |
37 | .Dd $Mdocdate: October 28 2010 $ | 37 | .Dd $Mdocdate: November 13 2010 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -626,6 +626,43 @@ escape characters: | |||
626 | It is possible to have | 626 | It is possible to have |
627 | multiple identity files specified in configuration files; all these | 627 | multiple identity files specified in configuration files; all these |
628 | identities will be tried in sequence. | 628 | identities will be tried in sequence. |
629 | .It Cm IPQoS | ||
630 | Specifies the IPv4 type-of-service or DSCP class for connections. | ||
631 | Accepted values are | ||
632 | .Dq af11 , | ||
633 | .Dq af12 , | ||
634 | .Dq af13 , | ||
635 | .Dq af14 , | ||
636 | .Dq af22 , | ||
637 | .Dq af23 , | ||
638 | .Dq af31 , | ||
639 | .Dq af32 , | ||
640 | .Dq af33 , | ||
641 | .Dq af41 , | ||
642 | .Dq af42 , | ||
643 | .Dq af43 , | ||
644 | .Dq cs0 , | ||
645 | .Dq cs1 , | ||
646 | .Dq cs2 , | ||
647 | .Dq cs3 , | ||
648 | .Dq cs4 , | ||
649 | .Dq cs5 , | ||
650 | .Dq cs6 , | ||
651 | .Dq cs7 , | ||
652 | .Dq ef , | ||
653 | .Dq lowdelay , | ||
654 | .Dq throughput , | ||
655 | .Dq reliability , | ||
656 | or a numeric value. | ||
657 | This option may take one or two arguments. | ||
658 | If one argument is specified, it is used as the packet class unconditionally. | ||
659 | If two values are specified, the first is automatically selected for | ||
660 | interactive sessions and the second for non-interactive sessions. | ||
661 | The default is | ||
662 | .Dq lowdelay | ||
663 | for interactive sessions and | ||
664 | .Dq throughput | ||
665 | for non-interactive sessions. | ||
629 | .It Cm KbdInteractiveAuthentication | 666 | .It Cm KbdInteractiveAuthentication |
630 | Specifies whether to use keyboard-interactive authentication. | 667 | Specifies whether to use keyboard-interactive authentication. |
631 | The argument to this keyword must be | 668 | The argument to this keyword must be |