Browse Source

Fix bug2571: warn on EntryNodes set and UseEntryGuards disabled

Nick Mathewson 12 years ago
parent
commit
782b7f49d8
2 changed files with 7 additions and 0 deletions
  1. 3 0
      changes/bug2571
  2. 4 0
      src/or/config.c

+ 3 - 0
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.

+ 4 - 0
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, {