diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-02-06 12:46:17 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-02-06 12:46:17 +0000 |
| commit | c054f90f029915679db24d61559a7bdde1a9414b (patch) | |
| tree | e70cb32c0b0f96b47992c179dada5195dcaf62fd /src/or/config.c | |
| parent | bbcf406d9fe0c5a51f76e0adb37bf854091246c5 (diff) | |
| download | tor-c054f90f029915679db24d61559a7bdde1a9414b.tar tor-c054f90f029915679db24d61559a7bdde1a9414b.tar.gz | |
New config option ServerDNSAllowBrokenResolvConf to start a relay
even when the local resolv.conf file is missing, broken, or contains
only unusable nameservers.
Now I can run a local network on my laptop when I'm on an airplane.
svn:r13402
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index cca9a3c40..522e0c06f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -265,6 +265,7 @@ static config_var_t _option_vars[] = { V(RunTesting, BOOL, "0"), V(SafeLogging, BOOL, "1"), V(SafeSocks, BOOL, "0"), + V(ServerDNSAllowBrokenResolvConf, BOOL, "0"), V(ServerDNSAllowNonRFC953Hostnames, BOOL,"0"), V(ServerDNSDetectHijacking, BOOL, "1"), V(ServerDNSResolvConfFile, STRING, NULL), @@ -3252,7 +3253,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->V3AuthVoteDelay + options->V3AuthDistDelay >= options->V3AuthVotingInterval/2) { - REJECT("V3AuthVoteDelay and V3AuthDistDelay must be no more than half " + REJECT("V3AuthVoteDelay plus V3AuthDistDelay must be less than half " "V3AuthVotingInterval"); } if (options->V3AuthVoteDelay < MIN_VOTE_SECONDS) |