upstream: make PerSourceMaxStartups first-match-wins; ok dtucker@
OpenBSD-Commit-ID: dac0c24cb709e3c595b8b4f422a0355dc5a3b4e7
This commit is contained in:
parent
cfa66857db
commit
f98031773d
|
@ -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
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||||
* All rights reserved
|
* All rights reserved
|
||||||
|
@ -2030,7 +2030,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
|
||||||
fatal("%s line %d: %s integer value %s.",
|
fatal("%s line %d: %s integer value %s.",
|
||||||
filename, linenum, keyword, errstr);
|
filename, linenum, keyword, errstr);
|
||||||
}
|
}
|
||||||
if (*activep)
|
if (*activep && options->per_source_max_startups == -1)
|
||||||
options->per_source_max_startups = value;
|
options->per_source_max_startups = value;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue