summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-03-05 02:40:58 +0000
committerNick Mathewson <nickm@torproject.org>2007-03-05 02:40:58 +0000
commit52713788b4dfafd7c07733f037e64bf2fec14ea1 (patch)
treece508592312f80d17c759974d680e319c19ee60b /src/or/config.c
parent92f62b36846e3c82f5521fa17f7a4f5afde827af (diff)
downloadtor-52713788b4dfafd7c07733f037e64bf2fec14ea1.tar.gz
tor-52713788b4dfafd7c07733f037e64bf2fec14ea1.zip
r12080@catbus: nickm | 2007-03-04 21:40:55 -0500
Remove dnsworkers and related code. there goes another 550 lines of code. svn:r9736
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 7aade11d81..47a2786b6c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1001,13 +1001,10 @@ options_act(or_options_t *old_options)
cpuworkers_rotate();
if (dns_reset())
return -1;
- }
-#ifdef USE_EVENTDNS
- else {
+ } else {
if (dns_reset())
return -1;
}
-#endif
}
/* Check if we need to parse and add the EntryNodes config option. */
@@ -2714,12 +2711,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
if (options->UseEntryGuards && ! options->NumEntryGuards)
REJECT("Cannot enable UseEntryGuards with NumEntryGuards set to 0");
-#ifndef USE_EVENTDNS
- if (options->ServerDNSResolvConfFile)
- log(LOG_WARN, LD_CONFIG,
- "ServerDNSResolvConfFile only works when eventdns support is enabled.");
-#endif
-
if (check_nickname_list(options->ExitNodes, "ExitNodes", msg))
return -1;
if (check_nickname_list(options->EntryNodes, "EntryNodes", msg))