diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-05-27 21:59:11 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-05-28 10:25:18 +1000 |
| commit | 0a9a611619b0a1fecd0195ec86a9885f5d681c84 (patch) | |
| tree | dc1f2ae4ee5d131bf1928c92956bbe4b4b7fb36f /servconf.c | |
| parent | 16ea1fdbe736648f79a827219134331f8d9844fb (diff) | |
| download | openssh-git-0a9a611619b0a1fecd0195ec86a9885f5d681c84.tar.gz | |
upstream: Do not call process_queued_listen_addrs() for every
included file from sshd_config; patch from Jakub Jelen
OpenBSD-Commit-ID: 0ff603d6f06a7fab4881f12503b53024799d0a49
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.363 2020/04/17 03:30:05 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.364 2020/05/27 21:59:11 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -74,8 +74,8 @@ static void add_listen_addr(ServerOptions *, const char *, const char *, int); static void add_one_listen_addr(ServerOptions *, const char *, const char *, int); -void parse_server_config_depth(ServerOptions *options, const char *filename, - struct sshbuf *conf, struct include_list *includes, +static void parse_server_config_depth(ServerOptions *options, + const char *filename, struct sshbuf *conf, struct include_list *includes, struct connection_info *connectinfo, int flags, int *activep, int depth); /* Use of privilege separation or not */ @@ -2570,7 +2570,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) #undef M_CP_STRARRAYOPT #define SERVCONF_MAX_DEPTH 16 -void +static void parse_server_config_depth(ServerOptions *options, const char *filename, struct sshbuf *conf, struct include_list *includes, struct connection_info *connectinfo, int flags, int *activep, int depth) @@ -2596,7 +2596,6 @@ parse_server_config_depth(ServerOptions *options, const char *filename, if (bad_options > 0) fatal("%s: terminating, %d bad configuration options", filename, bad_options); - process_queued_listen_addrs(options); } void @@ -2607,6 +2606,7 @@ parse_server_config(ServerOptions *options, const char *filename, int active = connectinfo ? 0 : 1; parse_server_config_depth(options, filename, conf, includes, connectinfo, 0, &active, 0); + process_queued_listen_addrs(options); } static const char * |