Commit 21c6c848 authored by Linus Nordberg's avatar Linus Nordberg Committed by Nick Mathewson
Browse files

Allow TestingTorNetwork when alternate dir and bridge authorities are set. 

Allow TestingTorNetwork when AlternateDirAuthority and
AlternateBridgeAuthority is set even if DirServer is not.
parent 93b73017

changes/bug6377

0 → 100644
+4 −0
Original line number Diff line number Diff line 
 o Testing:

   - Make it possible to set the TestingTorNetwork configuration

     option using AlternateDirAuthority and AlternateBridgeAuthority

     as an alternative to setting DirServer.

src/or/config.c

+6 −2
Original line number Diff line number Diff line
@@ -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) {