]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Make the guardfraction.c module dirauth-only.
authorNick Mathewson <nickm@torproject.org>
Tue, 30 Apr 2019 15:31:57 +0000 (11:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 30 Apr 2019 19:00:08 +0000 (15:00 -0400)
src/app/config/config.c
src/core/include.am

index 81a83e2c5febff3fd8b1033176abafb410316068..3e0683eb56c2f259b2ed41cd6b0db4a43e6f44f5 100644 (file)
@@ -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)
index 02b90ba1808732f4c2b52d105950052419490a53..8ddbdbc0b7d9e88c70e92e0d985cc3403ac36f08 100644 (file)
@@ -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                     \