summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-15 11:46:55 -0500
committerNick Mathewson <nickm@torproject.org>2019-12-19 07:54:56 -0500
commitffa3499d81823eb21811a479c31b59f1bfb5bc61 (patch)
tree3841d1247c282792a1f4c3952ab09c305b66e718 /src/app
parent419ba97df5bd168bf773478270c0043f20328e15 (diff)
downloadtor-ffa3499d81823eb21811a479c31b59f1bfb5bc61.tar.gz
tor-ffa3499d81823eb21811a479c31b59f1bfb5bc61.zip
Add config object for dirauth; move one option there.
I've chosen the "AuthDirMaxServersPerAddr" option here for simplicity, since it is used literally nowhere else besides the dirauth module. Once we have all the infrastructure in place for this, we can move more options into this structure.
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c1
-rw-r--r--src/app/config/or_options_st.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 5ea8cec6a6..680a7eeefa 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -337,7 +337,6 @@ static const config_var_t option_vars_[] = {
OBSOLETE("AuthDirRejectUnlisted"),
OBSOLETE("AuthDirListBadDirs"),
V(AuthDirListBadExits, BOOL, "0"),
- V(AuthDirMaxServersPerAddr, POSINT, "2"),
OBSOLETE("AuthDirMaxServersPerAuthAddr"),
V(AuthDirHasIPv6Connectivity, BOOL, "0"),
VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"),
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index a3d63d9208..e63ae2510f 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -467,8 +467,6 @@ struct or_options_t {
int AuthDirListBadExits; /**< True iff we should list bad exits,
* and vote for all other exits as good. */
- int AuthDirMaxServersPerAddr; /**< Do not permit more than this
- * number of servers per IP address. */
int AuthDirHasIPv6Connectivity; /**< Boolean: are we on IPv6? */
int AuthDirPinKeys; /**< Boolean: Do we enforce key-pinning? */