diff options
| author | teor <teor@torproject.org> | 2019-10-30 15:43:30 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-31 12:34:20 +1000 |
| commit | 23faa03ffc28e8d1132370e861756e84d659be5e (patch) | |
| tree | 3c4fdff52774d71072e7b1fa5445c0bbe6588166 /src/feature/relay | |
| parent | 1d4d2deea1987171dea64bf3e563b24194b6ac84 (diff) | |
| download | tor-23faa03ffc28e8d1132370e861756e84d659be5e.tar.gz tor-23faa03ffc28e8d1132370e861756e84d659be5e.zip | |
relay/config: Remove direct references to dirauth options
All *AuthoritativeDir* options are now accessed via the authmode
functions in relay_config.c, relay/transport_config.c, and config.c.
Part of 32213.
Diffstat (limited to 'src/feature/relay')
| -rw-r--r-- | src/feature/relay/relay_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index ac00dbd141..7ef2a15132 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -1044,8 +1044,8 @@ options_act_relay(const or_options_t *old_options) /* We want to reinit keys as needed before we do much of anything else: keys are important, and other things can depend on them. */ if (transition_affects_workers || - (options->V3AuthoritativeDir && (!old_options || - !old_options->V3AuthoritativeDir))) { + (authdir_mode_v3(options) && (!old_options || + !authdir_mode_v3(old_options)))) { if (init_keys() < 0) { log_warn(LD_BUG,"Error initializing keys; exiting"); return -1; |