From: Roger Dingledine <arma@torproject.org>
Date: Fri, 11 Mar 2011 10:39:26 +0000 (-0500)
Subject: make formal a constraint that's been true a while now
X-Git-Tag: tor-0.2.2.25-alpha~13^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f47cfc21a8fa91b98a48291c316121135fa3f17;p=thirdparty%2Ftor.git

make formal a constraint that's been true a while now
---

diff --git a/src/or/config.c b/src/or/config.c
index bd904dcf0b..404e648dba 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, {