Commit 4ef1c459 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Refuse to start if both ORPort and UseBridges are set. Bugfix 

on 0.2.0.x.


svn:r12182
parent ea4c3d6d

ChangeLog

+6 −0
Original line number Diff line number Diff line 
Changes in version 0.2.0.10-alpha - 2007-1?-??

  o Minor bugfixes:

    - Refuse to start if both ORPort and UseBridges are set. Bugfix

      on 0.2.0.x.





Changes in version 0.2.0.9-alpha - 2007-10-24

  o Major features (directory system):

    - Clients now download v3 consensus networkstatus documents instead

src/or/config.c

+5 −0
Original line number Diff line number Diff line
@@ -2780,6 +2780,11 @@ options_validate(or_options_t *old_options, or_options_t *options, 
           "of the Internet, so they must not set Reachable*Addresses "

           "or FascistFirewall.");



  if (options->UseBridges &&

      server_mode(options))

    REJECT("Servers must be able to freely connect to the rest "

           "of the Internet, so they must not set UseBridges.");



  options->_AllowInvalid = 0;

  if (options->AllowInvalidNodes) {

    SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, {