diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-07-23 23:37:02 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-07-24 14:48:47 +1000 |
commit | 51676ec61491ec6d7cbd06082034e29b377b3bf6 (patch) | |
tree | 60fb899d14e5a843a730db1665024c2784cca5e3 /sshd_config.5 | |
parent | 6c1fbd5a50d8d2415f06c920dd3b1279b741072d (diff) |
upstream commit
Allow IPQoS=none in ssh/sshd to not set an explicit
ToS/DSCP value and just use the operating system default; ok dtucker@
Upstream-ID: 77906ff8c7b660b02ba7cb1e47b17d66f54f1f7e
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 6a77c9343..76e157f2e 100644 --- a/sshd_config.5 +++ b/sshd_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: sshd_config.5,v 1.249 2017/07/13 19:16:33 jmc Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.250 2017/07/23 23:37:02 djm Exp $ |
37 | .Dd $Mdocdate: July 13 2017 $ | 37 | .Dd $Mdocdate: July 23 2017 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -792,7 +792,9 @@ Accepted values are | |||
792 | .Cm lowdelay , | 792 | .Cm lowdelay , |
793 | .Cm throughput , | 793 | .Cm throughput , |
794 | .Cm reliability , | 794 | .Cm reliability , |
795 | or a numeric value. | 795 | a numeric value, or |
796 | .Cm none | ||
797 | to use the operating system default. | ||
796 | This option may take one or two arguments, separated by whitespace. | 798 | This option may take one or two arguments, separated by whitespace. |
797 | If one argument is specified, it is used as the packet class unconditionally. | 799 | If one argument is specified, it is used as the packet class unconditionally. |
798 | If two values are specified, the first is automatically selected for | 800 | If two values are specified, the first is automatically selected for |