From 51676ec61491ec6d7cbd06082034e29b377b3bf6 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sun, 23 Jul 2017 23:37:02 +0000 Subject: 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 --- misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'misc.c') diff --git a/misc.c b/misc.c index af24fa5c4..313c44109 100644 --- a/misc.c +++ b/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.110 2017/05/31 09:15:42 deraadt Exp $ */ +/* $OpenBSD: misc.c,v 1.111 2017/07/23 23:37:02 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -1085,6 +1085,7 @@ static const struct { const char *name; int value; } ipqos[] = { + { "none", INT_MAX }, /* can't use 0 here; that's CS0 */ { "af11", IPTOS_DSCP_AF11 }, { "af12", IPTOS_DSCP_AF12 }, { "af13", IPTOS_DSCP_AF13 }, -- cgit v1.2.3