[tor-commits] [tor/master] Allow TestingTorNetwork when alternate dir and bridge authorities are set.

[nickm at torproject.org]

commit 21c6c8485367ce66ab0791c153177c17bccd25c5
Author: Linus Nordberg <linus at torproject.org>
Date:   Wed Jul 11 11:53:07 2012 +0200

    Allow TestingTorNetwork when alternate dir and bridge authorities are set.
    
    Allow TestingTorNetwork when AlternateDirAuthority and
    AlternateBridgeAuthority is set even if DirServer is not.
---
 changes/bug6377 |    4 ++++
 src/or/config.c |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changes/bug6377 b/changes/bug6377
new file mode 100644
index 0000000..a3a3672
--- /dev/null
+++ b/changes/bug6377
@@ -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.
diff --git a/src/or/config.c b/src/or/config.c
index d90e0fc..f5b5c8f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -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 "
-           "a non-default set of DirServers.");
+           "a non-default set of DirServer or both of AlternateDirAuthority "
+           "and AlternateBridgeAuthority configured.");
   }
 
   if (options->AllowSingleHopExits && !options->DirServers) {