From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 17 Feb 2026 21:45:07 +0000 (+0000)
Subject: upstream: make IPQoS first-match-wins in sshd_config as it's
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b0f4a72bd87bef7cc9f0a1889cfc98545cbb158;p=thirdparty%2Fopenssh-portable.git

upstream: make IPQoS first-match-wins in sshd_config as it's

intended to be bz3924

OpenBSD-Commit-ID: 42753eb8400ab09713c69ace6fa8bfdde133f942
---

diff --git a/servconf.c b/servconf.c
index a43995fdd..14f0cabad 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.444 2026/02/11 22:57:16 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.445 2026/02/17 21:45:07 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2559,7 +2559,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 			    " using DSCP values.", filename, linenum, arg);
 			value2 = INT_MAX;
 		}
-		if (*activep) {
+		if (*activep && options->ip_qos_interactive == -1) {
 			options->ip_qos_interactive = value;
 			options->ip_qos_bulk = value2;
 		}