summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-04-30 11:31:57 -0400
committerNick Mathewson <nickm@torproject.org>2019-04-30 15:00:08 -0400
commit339ac4dc67af912e3c8608627e436fb866714538 (patch)
tree658e10e8a1ff21adb350ca2901e41afd1e291d6a
parent857bfc70330f9e808c99310f1efbc3fb5738c4fb (diff)
downloadtor-339ac4dc67af912e3c8608627e436fb866714538.tar.gz
tor-339ac4dc67af912e3c8608627e436fb866714538.zip
Make the guardfraction.c module dirauth-only.
-rw-r--r--src/app/config/config.c2
-rw-r--r--src/core/include.am2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 81a83e2c5f..3e0683eb56 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3561,10 +3561,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL,
NULL);
}
+#ifdef HAVE_MODULE_DIRAUTH
/* same for guardfraction file */
if (options->GuardfractionFile && !old_options) {
dirserv_read_guardfraction_file(options->GuardfractionFile, NULL);
}
+#endif
}
if (options->AuthoritativeDir && !options->DirPort_set)
diff --git a/src/core/include.am b/src/core/include.am
index 02b90ba180..8ddbdbc0b7 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -154,7 +154,6 @@ LIBTOR_APP_A_SOURCES = \
# the separation is only in the code location.
LIBTOR_APP_A_SOURCES += \
src/feature/dirauth/bwauth.c \
- src/feature/dirauth/guardfraction.c \
src/feature/dirauth/reachability.c \
src/feature/dirauth/voteflags.c
@@ -178,6 +177,7 @@ MODULE_DIRAUTH_SOURCES = \
src/feature/dirauth/dircollate.c \
src/feature/dirauth/dirvote.c \
src/feature/dirauth/dsigs_parse.c \
+ src/feature/dirauth/guardfraction.c \
src/feature/dirauth/process_descs.c \
src/feature/dirauth/recommend_pkg.c \
src/feature/dirauth/shared_random.c \