From 7733d570a985a350ceed49facb88a18edeabdd32 Mon Sep 17 00:00:00 2001 From: djm Date: Tue, 29 Aug 2023 02:50:10 +0000 Subject: [PATCH] make PerSourceMaxStartups first-match-wins; ok dtucker@ --- usr.bin/ssh/servconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index d8a652ddf54..84fc8a63a7d 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/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 , Espoo, Finland * All rights reserved @@ -1973,7 +1973,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; -- 2.20.1