diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-11-13 17:17:04 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-11-13 17:17:04 +0000 |
| commit | dc48e7aeed9bb6b66f000c383c0383eeddda2478 (patch) | |
| tree | 98f9e1e14e34e9eb7fe0f073a3b5497ce40550b1 /src | |
| parent | 08627d5d87294ee86b252dac0a2f9f003d7e24bf (diff) | |
| download | tor-dc48e7aeed9bb6b66f000c383c0383eeddda2478.tar.gz tor-dc48e7aeed9bb6b66f000c383c0383eeddda2478.zip | |
Document remaining configuration options; add a ccheck for redundant authentication mechanisms in options_validate; add TODO items for post-009 hibernation features
svn:r2833
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 133dd85183..4fa9eae6a1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1317,6 +1317,11 @@ options_validate(or_options_t *options) result = -1; } } + if (options->HashedControlPassword && options->CookieAuthentication) { + log_fn(LOG_WARN,"Cannot enable both HashedControlPassword and CookieAuthentication"); + result = -1; + } + if (check_nickname_list(options->ExitNodes, "ExitNodes")) result = -1; if (check_nickname_list(options->EntryNodes, "EntryNodes")) |