upstream: make IPTOS_DSCP_LE available via IPQoS directive; bz2986,

based on patch by veegish AT cyberstorm.mu

OpenBSD-Commit-ID: 9902bf4fbb4ea51de2193ac2b1d965bc5d99c425

diff --git a/misc.c b/misc.c
index 74e01a4c09cb6d391fffb5c076b052c59b2dec64..3a31d5c1807e05d451c1ffba0da2bc1021a1b6ef 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.145 2020/01/24 23:54:40 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.146 2020/01/28 01:49:36 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -1559,6 +1559,7 @@ static const struct {
        { "cs6", IPTOS_DSCP_CS6 },
        { "cs7", IPTOS_DSCP_CS7 },
        { "ef", IPTOS_DSCP_EF },
+       { "le", IPTOS_DSCP_LE },
        { "lowdelay", IPTOS_LOWDELAY },
        { "throughput", IPTOS_THROUGHPUT },
        { "reliability", IPTOS_RELIABILITY },

diff --git a/ssh_config.5 b/ssh_config.5
index 84020d1d6b11eb0a8c111bdbbd868b2db1f6f5d5..d36889b93dba9924319a97c415ba34a189b83e9b 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.318 2020/01/25 23:33:27 djm Exp $
-.Dd $Mdocdate: January 25 2020 $
+.\" $OpenBSD: ssh_config.5,v 1.319 2020/01/28 01:49:36 djm Exp $
+.Dd $Mdocdate: January 28 2020 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1040,6 +1040,7 @@ Accepted values are
 .Cm cs6 ,
 .Cm cs7 ,
 .Cm ef ,
+.Cm le ,
 .Cm lowdelay ,
 .Cm throughput ,
 .Cm reliability ,

diff --git a/sshd_config.5 b/sshd_config.5
index 2cddbd59858941f6994081e745d9ec2a2f61d410..1395a5e6db384892c59473ae9a4f8aff37b723a3 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.302 2020/01/25 22:41:01 djm Exp $
-.Dd $Mdocdate: January 25 2020 $
+.\" $OpenBSD: sshd_config.5,v 1.303 2020/01/28 01:49:36 djm Exp $
+.Dd $Mdocdate: January 28 2020 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -826,6 +826,7 @@ Accepted values are
 .Cm cs6 ,
 .Cm cs7 ,
 .Cm ef ,
+.Cm le ,
 .Cm lowdelay ,
 .Cm throughput ,
 .Cm reliability ,