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
This commit is contained in:
Nick Mathewson
2008-12-17 22:58:14 +00:00
parent 03f413f5c7
commit 2ad36f68c8
5 changed files with 16 additions and 5 deletions
+3 -2
View File
@@ -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"),
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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