View | Details | Raw Unified | Return to bug 3169
Collapse All | Expand All

(-)a/servconf.c (-3 / +3 lines)
Lines 74-80 static void add_listen_addr(ServerOptions *, const char *, Link Here
74
    const char *, int);
74
    const char *, int);
75
static void add_one_listen_addr(ServerOptions *, const char *,
75
static void add_one_listen_addr(ServerOptions *, const char *,
76
    const char *, int);
76
    const char *, int);
77
void parse_server_config_depth(ServerOptions *options, const char *filename,
77
static void parse_server_config_depth(ServerOptions *options, const char *filename,
78
    struct sshbuf *conf, struct include_list *includes,
78
    struct sshbuf *conf, struct include_list *includes,
79
    struct connection_info *connectinfo, int flags, int *activep, int depth);
79
    struct connection_info *connectinfo, int flags, int *activep, int depth);
80
80
Lines 2580-2586 copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) Link Here
2580
#undef M_CP_STRARRAYOPT
2580
#undef M_CP_STRARRAYOPT
2581
2581
2582
#define SERVCONF_MAX_DEPTH	16
2582
#define SERVCONF_MAX_DEPTH	16
2583
void
2583
static void
2584
parse_server_config_depth(ServerOptions *options, const char *filename,
2584
parse_server_config_depth(ServerOptions *options, const char *filename,
2585
    struct sshbuf *conf, struct include_list *includes,
2585
    struct sshbuf *conf, struct include_list *includes,
2586
    struct connection_info *connectinfo, int flags, int *activep, int depth)
2586
    struct connection_info *connectinfo, int flags, int *activep, int depth)
Lines 2606-2612 parse_server_config_depth(ServerOptions *options, const char *filename, Link Here
2606
	if (bad_options > 0)
2606
	if (bad_options > 0)
2607
		fatal("%s: terminating, %d bad configuration options",
2607
		fatal("%s: terminating, %d bad configuration options",
2608
		    filename, bad_options);
2608
		    filename, bad_options);
2609
	process_queued_listen_addrs(options);
2610
}
2609
}
2611
2610
2612
void
2611
void
Lines 2617-2622 parse_server_config(ServerOptions *options, const char *filename, Link Here
2617
	int active = connectinfo ? 0 : 1;
2616
	int active = connectinfo ? 0 : 1;
2618
	parse_server_config_depth(options, filename, conf, includes,
2617
	parse_server_config_depth(options, filename, conf, includes,
2619
	    connectinfo, 0, &active, 0);
2618
	    connectinfo, 0, &active, 0);
2619
	process_queued_listen_addrs(options);
2620
}
2620
}
2621
2621
2622
static const char *
2622
static const char *

Return to bug 3169