aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-10-13 09:16:40 -0400
committerNick Mathewson <nickm@torproject.org>2016-10-13 09:19:37 -0400
commit1fc3e291083493bd7517901f467a7341d5c6f650 (patch)
treecc3cf770302fe58571a758a0d72d3d2b20b6ffee /src/or/config.c
parent0e1b228aa6b5ed7665ba5167a2b88924e58fb9b5 (diff)
downloadtor-1fc3e291083493bd7517901f467a7341d5c6f650.tar.gz
tor-1fc3e291083493bd7517901f467a7341d5c6f650.zip
Remove duplicate code that checks for default authorities
Patch from ericho. Fixes 18529. Simple refactoring.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 93e753bb49..bef81ab812 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2471,7 +2471,7 @@ resolve_my_address(int warn_severity, const or_options_t *options,
addr_string = tor_dup_ip(addr);
if (tor_addr_is_internal(&myaddr, 0)) {
/* make sure we're ok with publishing an internal IP */
- if (!options->DirAuthorities && !options->AlternateDirAuthority) {
+ if (is_default_dir_authorities(options)) {
/* if they are using the default authorities, disallow internal IPs
* always. */
log_fn(warn_severity, LD_CONFIG,