[tor-commits] [tor/master] make formal a constraint that's been true a while now

[nickm at torproject.org]

commit 9f47cfc21a8fa91b98a48291c316121135fa3f17
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Mar 11 05:39:26 2011 -0500

    make formal a constraint that's been true a while now
---
 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 bd904dc..404e648 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, {