diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-03-11 05:39:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 23:54:15 -0400 |
| commit | 9f47cfc21a8fa91b98a48291c316121135fa3f17 (patch) | |
| tree | 8e8dbf269dbde7fe666d9f22db3128e86ef8373e | |
| parent | 2b5c39211c2259404ab9bc23a1788b6d529e838f (diff) | |
| download | tor-9f47cfc21a8fa91b98a48291c316121135fa3f17.tar tor-9f47cfc21a8fa91b98a48291c316121135fa3f17.tar.gz | |
make formal a constraint that's been true a while now
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index bd904dcf0..404e648db 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3189,6 +3189,12 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Servers must be able to freely connect to the rest " "of the Internet, so they must not set UseBridges."); + /* If both of these are set, we'll end up with funny behavior where we + * demand enough entrynodes be up and running else we won't build + * circuits, yet we never actually use them. */ + if (options->UseBridges && options->EntryNodes) + REJECT("You cannot set both UseBridges and EntryNodes."); + options->_AllowInvalid = 0; if (options->AllowInvalidNodes) { SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, { |