diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
| commit | 3c89622e39d964b731a40c6a705327d5caa07be4 (patch) | |
| tree | fd7e30579398838eea9a58eb48964c95f7298099 /src/app/config | |
| parent | 5e70c27e8560ac1885ae9d9e1b79d3838b49cc09 (diff) | |
| parent | efb301c86c288c01e21dfb5da9f685f33341b2c2 (diff) | |
| download | tor-3c89622e39d964b731a40c6a705327d5caa07be4.tar.gz tor-3c89622e39d964b731a40c6a705327d5caa07be4.zip | |
Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged
Resolved conflicts in src/core/include.am
Diffstat (limited to 'src/app/config')
| -rw-r--r-- | src/app/config/config.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 7d5470d5e6..2863c34b0e 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -88,7 +88,7 @@ #include "feature/control/control.h" #include "feature/control/control_auth.h" #include "feature/control/control_events.h" -#include "feature/dircache/dirserv.h" +#include "feature/dirclient/dirclient_modes.h" #include "feature/hibernate/hibernate.h" #include "feature/hs/hs_config.h" #include "feature/nodelist/dirlist.h" @@ -2424,10 +2424,10 @@ options_act,(const or_options_t *old_options)) /* We may need to reschedule some directory stuff if our status changed. */ if (old_options) { - if (!bool_eq(directory_fetches_dir_info_early(options), - directory_fetches_dir_info_early(old_options)) || - !bool_eq(directory_fetches_dir_info_later(options), - directory_fetches_dir_info_later(old_options)) || + if (!bool_eq(dirclient_fetches_dir_info_early(options), + dirclient_fetches_dir_info_early(old_options)) || + !bool_eq(dirclient_fetches_dir_info_later(options), + dirclient_fetches_dir_info_later(old_options)) || !config_lines_eq(old_options->Bridges, options->Bridges)) { /* Make sure update_router_have_minimum_dir_info() gets called. */ router_dir_info_changed(); @@ -2738,6 +2738,9 @@ list_enabled_modules(void) { printf("%s: %s\n", "relay", have_module_relay() ? "yes" : "no"); printf("%s: %s\n", "dirauth", have_module_dirauth() ? "yes" : "no"); + // We don't list dircache, because it cannot be enabled or disabled + // independently from relay. Listing it here would proliferate + // test variants in test_parseconf.sh to no useful purpose. } /** Last value actually set by resolve_my_address. */ |