summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c5
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"))