summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-17 22:58:14 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-17 22:58:14 +0000
commit2ad36f68c8e5bbbc0f284c04f266f80866d2aef9 (patch)
tree8468c4b90118a244057daa207acaffae5f5ed77c /src/or/main.c
parent03f413f5c7220be2d3313489a836fb92b67a6b1c (diff)
downloadtor-2ad36f68c8e5bbbc0f284c04f266f80866d2aef9.tar.gz
tor-2ad36f68c8e5bbbc0f284c04f266f80866d2aef9.zip
Rename ServerDNSAllowBrokenResolvConf to ServerDNSAllowBrokenConfig.
(Many users have no idea what a resolv.conf is, and shouldn't be forced to learn. The old option will keep working for now.) Also, document it. svn:r17661
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index fbf96037ed..a84a62d6ac 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1386,7 +1386,7 @@ do_main_loop(void)
/* initialize dns resolve map, spawn workers if needed */
if (dns_init() < 0) {
- if (get_options()->ServerDNSAllowBrokenResolvConf)
+ if (get_options()->ServerDNSAllowBrokenConfig)
log_warn(LD_GENERAL, "Couldn't set up any working nameservers. "
"Network not up yet? Will try again soon.");
else {