diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-10-25 04:40:27 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-10-25 04:40:27 +0000 |
| commit | 4ef1c459ba360abdbb7d48d5055ad7b80f64b450 (patch) | |
| tree | 2aa28a0e87164fbeb617ad0594a6dbfe23136e66 | |
| parent | ea4c3d6d1dfe75f14c6c8934c4e6fcfbc5afc204 (diff) | |
| download | tor-4ef1c459ba360abdbb7d48d5055ad7b80f64b450.tar.gz tor-4ef1c459ba360abdbb7d48d5055ad7b80f64b450.zip | |
Refuse to start if both ORPort and UseBridges are set. Bugfix
on 0.2.0.x.
svn:r12182
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/or/config.c | 5 |
2 files changed, 11 insertions, 0 deletions
@@ -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 diff --git a/src/or/config.c b/src/or/config.c index b4d7e3e87a..9997bfbe0e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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, { |