From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 Dec 2011 15:31:52 +0000 (-0500)
Subject: Fix bug2571: warn on EntryNodes set and UseEntryGuards disabled
X-Git-Tag: tor-0.2.3.11-alpha~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=782b7f49d8a681113a48c6108174164e7df2f72c;p=thirdparty%2Ftor.git

Fix bug2571: warn on EntryNodes set and UseEntryGuards disabled
---

diff --git a/changes/bug2571 b/changes/bug2571
new file mode 100644
index 0000000000..dfb4f3be3d
--- /dev/null
+++ b/changes/bug2571
@@ -0,0 +1,3 @@
+  - Minor features:
+    - If EntryNodes are given, but UseEntryGuards is set to 0, warn that
+      EntryNodes will have no effect. Resolves issue 2571.
diff --git a/src/or/config.c b/src/or/config.c
index 254e9fffd0..be4113f41a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3566,6 +3566,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
   if (options->UseBridges && options->EntryNodes)
     REJECT("You cannot set both UseBridges and EntryNodes.");
 
+  if (options->EntryNodes && !options->UseEntryGuards)
+    log_warn(LD_CONFIG, "EntryNodes is set, but UseEntryGuards is disabled. "
+             "EntryNodes will be ignored.");
+
   options->_AllowInvalid = 0;
   if (options->AllowInvalidNodes) {
     SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, {