aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug25713
-rw-r--r--src/or/config.c4
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, {