mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Allow TestingTorNetwork when alternate dir and bridge authorities are set.

Browse Source 
Allow TestingTorNetwork when AlternateDirAuthority and
AlternateBridgeAuthority is set even if DirServer is not.
This commit is contained in:
Linus Nordberg 2012-07-11 11:53:07 +02:00 committed by Nick Mathewson
parent 93b7301755
commit 21c6c84853
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug6377 Normal file
View File

@ -0,0 +1,4 @@
o Testing:
- Make it possible to set the TestingTorNetwork configuration
option using AlternateDirAuthority and AlternateBridgeAuthority
as an alternative to setting DirServer.

8
src/or/config.c
View File

@ -4091,9 +4091,13 @@ options_validate(or_options_t *old_options, or_options_t *options,
}); });
} }
if (options->TestingTorNetwork && !options->DirServers) { if (options->TestingTorNetwork &&
!(options->DirServers ||
(options->AlternateDirAuthority &&
options->AlternateBridgeAuthority))) {
REJECT("TestingTorNetwork may only be configured in combination with " REJECT("TestingTorNetwork may only be configured in combination with "
"a non-default set of DirServers."); "a non-default set of DirServer or both of AlternateDirAuthority "
"and AlternateBridgeAuthority configured.");
} }
if (options->AllowSingleHopExits && !options->DirServers) { if (options->AllowSingleHopExits && !options->DirServers) {