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/config.c | |
| 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/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 3 insertions, 2 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"), |