diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-12-17 22:58:14 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-12-17 22:58:14 +0000 |
| commit | 2ad36f68c8e5bbbc0f284c04f266f80866d2aef9 (patch) | |
| tree | 8468c4b90118a244057daa207acaffae5f5ed77c /src/or | |
| parent | 03f413f5c7220be2d3313489a836fb92b67a6b1c (diff) | |
| download | tor-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')
| -rw-r--r-- | src/or/config.c | 5 | ||||
| -rw-r--r-- | src/or/main.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 3c224eee62..0dd9a0f03f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -85,6 +85,7 @@ static config_abbrev_t _option_abbrevs[] = { { "NumEntryNodes", "NumEntryGuards", 0, 0}, { "ResolvConf", "ServerDNSResolvConfFile", 0, 1}, { "SearchDomains", "ServerDNSSearchDomains", 0, 1}, + { "ServerDNSAllowBrokenResolvConf", "SeverDNSAllowBrokenConfig", 0, 0 }, { "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0}, { "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0}, { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, @@ -290,7 +291,7 @@ static config_var_t _option_vars[] = { V(RunTesting, BOOL, "0"), V(SafeLogging, BOOL, "1"), V(SafeSocks, BOOL, "0"), - V(ServerDNSAllowBrokenResolvConf, BOOL, "1"), + V(ServerDNSAllowBrokenConfig, BOOL, "1"), V(ServerDNSAllowNonRFC953Hostnames, BOOL,"0"), V(ServerDNSDetectHijacking, BOOL, "1"), V(ServerDNSRandomizeCase, BOOL, "1"), @@ -345,7 +346,7 @@ static config_var_t _option_vars[] = { /* Keep defaults synchronous with man page and config value check. */ static config_var_t testing_tor_network_defaults[] = { - V(ServerDNSAllowBrokenResolvConf, BOOL, "1"), + V(ServerDNSAllowBrokenConfig, BOOL, "1"), V(DirAllowPrivateAddresses, BOOL, "1"), V(EnforceDistinctSubnets, BOOL, "0"), V(AssumeReachable, BOOL, "1"), 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 { diff --git a/src/or/or.h b/src/or/or.h index cea0cf15c9..999e8ddbab 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2462,7 +2462,7 @@ typedef struct { will know this without any specialized knowledge. */ /** Boolean: if set, we start even if our resolv.conf file is missing * or broken. */ - int ServerDNSAllowBrokenResolvConf; + int ServerDNSAllowBrokenConfig; smartlist_t *ServerDNSTestAddresses; /**< A list of addresses that definitely * should be resolveable. Used for |