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

1 files changed, 2 insertions, 2 deletions

diff --git a/packet.c b/packet.c
index 9458ffdb2..ff69b6601 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.262 2017/06/24 06:38:11 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.263 2017/07/23 23:37:02 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1997,7 +1997,7 @@ void
 ssh_packet_set_tos(struct ssh *ssh, int tos)
 {
 #ifndef IP_TOS_IS_BROKEN
-        if (!ssh_packet_connection_is_on_socket(ssh))
+        if (!ssh_packet_connection_is_on_socket(ssh) || tos == INT_MAX)
                 return;
         switch (ssh_packet_connection_af(ssh)) {
 # ifdef IP_TOS