Commit 782b7f49 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Fix bug2571: warn on EntryNodes set and UseEntryGuards disabled

parent 8b4e7f9a

changes/bug2571

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  - Minor features:

    - If EntryNodes are given, but UseEntryGuards is set to 0, warn that

      EntryNodes will have no effect. Resolves issue 2571.

src/or/config.c

+4 −0
Original line number Diff line number Diff line
@@ -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, {