sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

on 0.2.0.x.


svn:r12182
This commit is contained in:
Roger Dingledine 2007-10-25 04:40:27 +00:00
parent ea4c3d6d1d
commit 4ef1c459ba
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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

5
src/or/config.c
View File

@ -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, {