diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-17 08:37:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-17 08:37:33 -0500 |
| commit | 7f03ba06d8447025ef3e53906ebe9bcdd0d4d1b5 (patch) | |
| tree | 0ca7cbfd413cfcc3646f82e539c37a67cc43b4b2 /src/feature/dirauth/process_descs.c | |
| parent | abd9ae48ac2306dc2784d9af2b34b883d83534f4 (diff) | |
| parent | 6d2b9c963100dab56f61786b65d8629faaada7ad (diff) | |
| download | tor-7f03ba06d8447025ef3e53906ebe9bcdd0d4d1b5.tar.gz tor-7f03ba06d8447025ef3e53906ebe9bcdd0d4d1b5.zip | |
Merge branch 'ticket32806'
Diffstat (limited to 'src/feature/dirauth/process_descs.c')
| -rw-r--r-- | src/feature/dirauth/process_descs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 139c6834a9..baf8f8c217 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -20,6 +20,7 @@ #include "app/config/config.h" #include "core/or/policies.h" #include "core/or/versions.h" +#include "feature/dirauth/dirauth_sys.h" #include "feature/dirauth/keypin.h" #include "feature/dirauth/reachability.h" #include "feature/dirclient/dlstatus.h" @@ -35,6 +36,7 @@ #include "feature/relay/router.h" #include "core/or/tor_version_st.h" +#include "feature/dirauth/dirauth_options_st.h" #include "feature/nodelist/extrainfo_st.h" #include "feature/nodelist/node_st.h" #include "feature/nodelist/microdesc_st.h" @@ -289,7 +291,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity) { char d[DIGEST_LEN]; - const int key_pinning = get_options()->AuthDirPinKeys; + const int key_pinning = dirauth_get_options()->AuthDirPinKeys; uint32_t r; ed25519_public_key_t *signing_key = NULL; @@ -741,7 +743,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) char *desc, *nickname; const size_t desclen = ri->cache_info.signed_descriptor_len + ri->cache_info.annotations_len; - const int key_pinning = get_options()->AuthDirPinKeys; + const int key_pinning = dirauth_get_options()->AuthDirPinKeys; *msg = NULL; /* If it's too big, refuse it now. Otherwise we'll cache it all over the |