upstream: Do not call process_queued_listen_addrs() for every

included file from sshd_config; patch from Jakub Jelen

OpenBSD-Commit-ID: 0ff603d6f06a7fab4881f12503b53024799d0a49

Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=0a9a611619b0a1fecd0195ec86a9885f5d681c84
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=3169
Bug-Debian: https://bugs.debian.org/962035
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1876320
Last-Update: 2020-06-07

Patch-Name: avoid-extra-ports.patch

1 files changed, 5 insertions, 5 deletions

diff --git a/servconf.c b/servconf.c
index c290e9786..5f3336365 100644
--- a/servconf.c
+++ b/servconf.c
@@ -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
@@ -75,8 +75,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 */
@@ -2623,7 +2623,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)
@@ -2649,7 +2649,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
@@ -2660,6 +2659,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 *