Move AuthDirListBadExits to dirauth module.

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 2d1d09e185466bc9420a065e12df00a9d6c57eec..815cd76e80441ca2e0bf1871ff391a028120a14b 100644 (file)
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -334,7 +334,6 @@ static const config_var_t option_vars_[] = {
   V(AuthDirRejectCCs,            CSV,      ""),
   OBSOLETE("AuthDirRejectUnlisted"),
   OBSOLETE("AuthDirListBadDirs"),
-  V(AuthDirListBadExits,         BOOL,     "0"),
   OBSOLETE("AuthDirMaxServersPerAuthAddr"),
   VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),
   V(AutomapHostsOnResolve,       BOOL,     "0"),

diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index b8da3cdd0912ab0fb449b234484fbcc0319b87c8..45175e7c2e8e63279e0f6242f4e5cb5dd5285e74 100644 (file)
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -457,8 +457,6 @@ struct or_options_t {
   struct smartlist_t *AuthDirRejectCCs;
   /**@}*/
 
-  int AuthDirListBadExits; /**< True iff we should list bad exits,
-                            * and vote for all other exits as good. */
   int AuthDirPinKeys; /**< Boolean: Do we enforce key-pinning? */
 
   char *AccountingStart; /**< How long is the accounting interval, and when

diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc
index ea1c59e83c3330670c0bcb29d37b325de910a0d3..af3a22c8fa980c7e975c49f3a63790d2c92b7290 100644 (file)
--- a/src/feature/dirauth/dirauth_options.inc
+++ b/src/feature/dirauth/dirauth_options.inc
@@ -23,6 +23,10 @@ CONF_VAR(AuthDirGuardBWGuarantee, MEMUNIT, 0, "2 MB")
 /** Boolean: are we on IPv6?  */
 CONF_VAR(AuthDirHasIPv6Connectivity, BOOL, 0, "0")
 
+/** True iff we should list bad exits, * and vote for all other exits as
+ * good. */
+CONF_VAR(AuthDirListBadExits, BOOL, 0, "0")
+
 /** Do not permit more than this number of servers per IP address. */
 CONF_VAR(AuthDirMaxServersPerAddr, POSINT, 0, "2")
 

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index acb661717893c926be1fdf9f5ecf8060d367c6b0..7caa6bf30df4a7a787e91cdb009c5eebb26e4e95 100644 (file)
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -4427,7 +4427,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
   smartlist_t *routers, *routerstatuses;
   char identity_digest[DIGEST_LEN];
   char signing_key_digest[DIGEST_LEN];
-  int listbadexits = options->AuthDirListBadExits;
+  const int listbadexits = d_options->AuthDirListBadExits;
   routerlist_t *rl = router_get_routerlist();
   time_t now = time(NULL);
   time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH;