[tor-commits] [tor/master] relay/config: Remove direct references to dirauth options

[teor at torproject.org]

commit 23faa03ffc28e8d1132370e861756e84d659be5e
Author: teor <teor at torproject.org>
Date:   Wed Oct 30 15:43:30 2019 +1000

    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.
---
 src/feature/relay/relay_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c
index ac00dbd14..7ef2a1513 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;