Attachment 3398 Details for Bug 3169 – proposed patch

[patch] proposed patch

file_3169.txt (text/plain), 1.75 KB, created by Jakub Jelen on 2020-05-26 01:00:32 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2020-05-26 01:00:32 AEST

Size: 1.75 KB

patch

obsolete

>commit 127bbf121998f558771611303d3a7067af0d7d17
>Author: Jakub Jelen <jjelen@redhat.com>
>Date:   Mon May 25 16:56:39 2020 +0200
>
>    Do not call process_queued_listen_addrs() for every included file
>    
>    Fixes #3169
>
>diff --git a/servconf.c b/servconf.c
>index 5bb4b1f8..78a7d87d 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -74,7 +74,7 @@ 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,
>+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);
> 
>@@ -2580,7 +2580,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)
>@@ -2606,7 +2606,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
>@@ -2617,6 +2616,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 *

Actions: View | Diff

Attachments on bug 3169: 3396 | 3398