From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 29 Aug 2023 02:50:10 +0000 (+0000)
Subject: upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@
X-Git-Tag: V_9_5_P1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f98031773db361424d59e3301aa92aacf423d920;p=thirdparty%2Fopenssh-portable.git

upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@

OpenBSD-Commit-ID: dac0c24cb709e3c595b8b4f422a0355dc5a3b4e7
---

diff --git a/servconf.c b/servconf.c
index 45a2f2c27..e16f9e90f 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.396 2023/07/17 05:26:38 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.397 2023/08/29 02:50:10 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2030,7 +2030,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 				fatal("%s line %d: %s integer value %s.",
 				    filename, linenum, keyword, errstr);
 		}
-		if (*activep)
+		if (*activep && options->per_source_max_startups == -1)
 			options->per_source_max_startups = value;
 		break;