diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-15 10:42:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:34:29 -0400 |
| commit | 686aaa5c4c95ebd2c3ddfe46a237014e2813a9e7 (patch) | |
| tree | a54dad61dd8af2aa79dd971963cf222320233da6 /src/or | |
| parent | c6ca199888102a825f004f8613331f97525da486 (diff) | |
| download | tor-686aaa5c4c95ebd2c3ddfe46a237014e2813a9e7.tar.gz tor-686aaa5c4c95ebd2c3ddfe46a237014e2813a9e7.zip | |
Upgrade the warn for EntryNodes without UseEntryGuards to an error
fixes bug 8180
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 90a5dfbda1..aa34f87cef 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2001 Matej Pfajfar. + /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. * Copyright (c) 2007-2012, The Tor Project, Inc. */ @@ -3664,9 +3664,9 @@ 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."); + if (options->EntryNodes && !options->UseEntryGuards) { + REJECT("If EntryNodes is set, UseEntryGuards must be enabled."); + } options->_AllowInvalid = 0; if (options->AllowInvalidNodes) { |