diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-30 12:52:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-05-02 09:22:13 -0400 |
| commit | a45413e7d58363fc4df71376b7cfc56d52534f86 (patch) | |
| tree | 9ba319df09cfc5ded674b0931169cff226aa9f07 /src | |
| parent | 31fb4a78451a98a8d62e1f52e75e372a8a2dd48b (diff) | |
| download | tor-a45413e7d58363fc4df71376b7cfc56d52534f86.tar.gz tor-a45413e7d58363fc4df71376b7cfc56d52534f86.zip | |
Make keypin.c dirauth-only
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/main/shutdown.c | 1 | ||||
| -rw-r--r-- | src/core/include.am | 3 | ||||
| -rw-r--r-- | src/feature/dirauth/dirauth_sys.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index 92cd9c6f7b..390a512c13 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -97,7 +97,6 @@ tor_cleanup(void) } if (authdir_mode_tests_reachability(options)) rep_hist_record_mtbf_data(now, 0); - keypin_close_journal(); } timers_shutdown(); diff --git a/src/core/include.am b/src/core/include.am index 18b6046bfc..dc7371fedd 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -81,7 +81,6 @@ LIBTOR_APP_A_SOURCES = \ src/feature/control/control_getinfo.c \ src/feature/control/fmt_serverstatus.c \ src/feature/control/getinfo_geoip.c \ - src/feature/dirauth/keypin.c \ src/feature/dircache/conscache.c \ src/feature/dircache/consdiffmgr.c \ src/feature/dircache/dircache.c \ @@ -118,7 +117,6 @@ LIBTOR_APP_A_SOURCES = \ src/feature/hs_common/replaycache.c \ src/feature/hs_common/shared_random_client.c \ src/feature/keymgt/loadkey.c \ - src/feature/dirauth/keypin.c \ src/feature/nodelist/authcert.c \ src/feature/nodelist/describe.c \ src/feature/nodelist/dirlist.c \ @@ -173,6 +171,7 @@ MODULE_DIRAUTH_SOURCES = \ src/feature/dirauth/dirvote.c \ src/feature/dirauth/dsigs_parse.c \ src/feature/dirauth/guardfraction.c \ + src/feature/dirauth/keypin.c \ src/feature/dirauth/process_descs.c \ src/feature/dirauth/reachability.c \ src/feature/dirauth/recommend_pkg.c \ diff --git a/src/feature/dirauth/dirauth_sys.c b/src/feature/dirauth/dirauth_sys.c index f691d5618a..e38d391300 100644 --- a/src/feature/dirauth/dirauth_sys.c +++ b/src/feature/dirauth/dirauth_sys.c @@ -10,6 +10,7 @@ #include "feature/dirauth/dirauth_sys.h" #include "feature/dirauth/dirvote.h" #include "feature/dirauth/dirauth_periodic.h" +#include "feature/dirauth/keypin.h" #include "feature/dirauth/process_descs.h" #include "lib/subsys/subsys.h" @@ -27,6 +28,7 @@ subsys_dirauth_shutdown(void) dirserv_free_fingerprint_list(); dirvote_free_all(); dirserv_clear_measured_bw_cache(); + keypin_close_journal(); } const struct subsys_fns_t sys_dirauth = { |