diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-22 10:31:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-22 10:31:52 -0500 |
| commit | 782b7f49d8a681113a48c6108174164e7df2f72c (patch) | |
| tree | 04de89a5506342ae28974d041329a8bee7097bf7 | |
| parent | 8b4e7f9ac8e70a1d646fe7689d48847188eb89a2 (diff) | |
| download | tor-782b7f49d8a681113a48c6108174164e7df2f72c.tar.gz tor-782b7f49d8a681113a48c6108174164e7df2f72c.zip | |
Fix bug2571: warn on EntryNodes set and UseEntryGuards disabled
| -rw-r--r-- | changes/bug2571 | 3 | ||||
| -rw-r--r-- | src/or/config.c | 4 |
2 files changed, 7 insertions, 0 deletions
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, { |