nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make the guardfraction.c module dirauth-only.

Browse Source
This commit is contained in:
Nick Mathewson 2019-04-30 11:31:57 -04:00
parent 857bfc7033
commit 339ac4dc67
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/config/config.c
View File

@ -3561,10 +3561,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL, dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL,
NULL); NULL);
} }
#ifdef HAVE_MODULE_DIRAUTH
/* same for guardfraction file */ /* same for guardfraction file */
if (options->GuardfractionFile && !old_options) { if (options->GuardfractionFile && !old_options) {
dirserv_read_guardfraction_file(options->GuardfractionFile, NULL); dirserv_read_guardfraction_file(options->GuardfractionFile, NULL);
} }
#endif
} }
if (options->AuthoritativeDir && !options->DirPort_set) if (options->AuthoritativeDir && !options->DirPort_set)

2
src/core/include.am
View File

@ -154,7 +154,6 @@ LIBTOR_APP_A_SOURCES = \
# the separation is only in the code location. # the separation is only in the code location.
LIBTOR_APP_A_SOURCES += \ LIBTOR_APP_A_SOURCES += \
src/feature/dirauth/bwauth.c \ src/feature/dirauth/bwauth.c \
src/feature/dirauth/guardfraction.c \
src/feature/dirauth/reachability.c \ src/feature/dirauth/reachability.c \
src/feature/dirauth/voteflags.c src/feature/dirauth/voteflags.c
@ -178,6 +177,7 @@ MODULE_DIRAUTH_SOURCES = \
src/feature/dirauth/dircollate.c \ src/feature/dirauth/dircollate.c \
src/feature/dirauth/dirvote.c \ src/feature/dirauth/dirvote.c \
src/feature/dirauth/dsigs_parse.c \ src/feature/dirauth/dsigs_parse.c \
src/feature/dirauth/guardfraction.c \
src/feature/dirauth/process_descs.c \ src/feature/dirauth/process_descs.c \
src/feature/dirauth/recommend_pkg.c \ src/feature/dirauth/recommend_pkg.c \
src/feature/dirauth/shared_random.c \ src/feature/dirauth/shared_random.c \