[tor-commits] [tor/master] Make the guardfraction.c module dirauth-only.

[asn@xxxxxxxxxxxxxx]

commit 339ac4dc67af912e3c8608627e436fb866714538
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 30 11:31:57 2019 -0400

    Make the guardfraction.c module dirauth-only.
---
 src/app/config/config.c | 2 ++
 src/core/include.am     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 81a83e2c5..3e0683eb5 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 02b90ba18..8ddbdbc0b 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			\



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits