[tor-commits] [tor/master] config: Make circuit_build_times_disabled() use authdir_mode()

[nickm at torproject.org]

commit f0838e7257482e87a90f6844cb832a4ddf2197e5
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Apr 5 09:17:12 2018 -0400

    config: Make circuit_build_times_disabled() use authdir_mode()
    
    Don't access the AuthoritativeDir options directly. We do this so we can move
    authdir_mode() to the dirauth module.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/circuitstats.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c
index 643831927..6015bcf85 100644
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@ -35,6 +35,7 @@
 #include "networkstatus.h"
 #include "rendclient.h"
 #include "rendservice.h"
+#include "router.h"
 #include "statefile.h"
 #include "circuitlist.h"
 #include "circuituse.h"
@@ -125,7 +126,7 @@ circuit_build_times_disabled_(const or_options_t *options,
       ignore_consensus ? 0 : networkstatus_get_param(NULL, "cbtdisabled",
                                                      0, 0, 1);
     int config_disabled = !options->LearnCircuitBuildTimeout;
-    int dirauth_disabled = options->AuthoritativeDir;
+    int dirauth_disabled = authdir_mode(options);
     int state_disabled = did_last_state_file_write_fail() ? 1 : 0;
     /* LearnCircuitBuildTimeout and Tor2web/Single Onion Services are
      * incompatible in two ways: