summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-07-23 23:37:02 +0000
committerDamien Miller <djm@mindrot.org>2017-07-24 14:48:47 +1000
commit51676ec61491ec6d7cbd06082034e29b377b3bf6 (patch)
tree60fb899d14e5a843a730db1665024c2784cca5e3 /misc.c
parent6c1fbd5a50d8d2415f06c920dd3b1279b741072d (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 'misc.c')
-rw-r--r--misc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc.c b/misc.c
index af24fa5c4..313c44109 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.110 2017/05/31 09:15:42 deraadt Exp $ */ 1/* $OpenBSD: misc.c,v 1.111 2017/07/23 23:37:02 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -1085,6 +1085,7 @@ static const struct {
1085 const char *name; 1085 const char *name;
1086 int value; 1086 int value;
1087} ipqos[] = { 1087} ipqos[] = {
1088 { "none", INT_MAX }, /* can't use 0 here; that's CS0 */
1088 { "af11", IPTOS_DSCP_AF11 }, 1089 { "af11", IPTOS_DSCP_AF11 },
1089 { "af12", IPTOS_DSCP_AF12 }, 1090 { "af12", IPTOS_DSCP_AF12 },
1090 { "af13", IPTOS_DSCP_AF13 }, 1091 { "af13", IPTOS_DSCP_AF13 },