mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1886'

Browse source
This commit is contained in:
David Goulet 2020-05-19 15:18:17 -04:00
commit ca13249dcc
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/encoding/confline.c
View file

@ -151,6 +151,8 @@ config_get_lines_aux(const char *string, config_line_t **result, int extended,
if (allow_include && !strcmp(k, "%include") && handle_include) {
tor_free(k);
include_used = 1;
log_notice(LD_CONFIG, "Processing configuration path \"%s\" at "
"recursion level %d.", v, recursion_level);
config_line_t *include_list;
if (handle_include(v, recursion_level, extended, &include_list,
@ -161,9 +163,6 @@ config_get_lines_aux(const char *string, config_line_t **result, int extended,
tor_free(v);
return -1;
}
log_notice(LD_CONFIG, "Included configuration file or "
"directory at recursion level %d: \"%s\".",
recursion_level, v);
*next = include_list;
if (list_last)
next = &list_last->next;

1
src/lib/fs/conffile.c
View file

@ -152,6 +152,7 @@ config_process_include(const char *path, int recursion_level, int extended,
int rv = -1;
SMARTLIST_FOREACH_BEGIN(config_files, const char *, config_file) {
log_notice(LD_CONFIG, "Including configuration file \"%s\".", config_file);
config_line_t *included_config = NULL;
config_line_t *included_config_last = NULL;
if (config_get_included_config(config_file, recursion_level, extended,

2
src/test/conf_examples/empty_3/expected_log
View file

@ -1 +1 @@
Included configuration .*directory at recursion level 1.*included
Processing configuration path \".*included\" at recursion level 1\.

2
src/test/conf_examples/include_1/expected_log
View file

@ -1 +1 @@
Included configuration file .*at recursion level 2.*nested\.inc
Processing configuration path \".*nested\.inc\" at recursion level 2\.

2
src/test/conf_examples/include_bug_31408/expected_log
View file

@ -1 +1 @@
Included configuration .*directory at recursion level 1.*included
Processing configuration path \".*included\" at recursion level 1\.