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.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 1d03146cf1..48f08e5b5f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -128,6 +128,7 @@ static config_var_t config_vars[] = {
VAR("FirewallPorts", CSV, FirewallPorts, "80,443"),
VAR("MyFamily", STRING, MyFamily, NULL),
VAR("NodeFamily", LINELIST, NodeFamilies, NULL),
+ VAR("NoPublish", BOOL, NoPublish, "0"),
VAR("Group", STRING, Group, NULL),
VAR("HashedControlPassword",STRING, HashedControlPassword, NULL),
VAR("HttpProxy", STRING, HttpProxy, NULL),
@@ -1330,6 +1331,11 @@ options_validate(or_options_t *options)
result = -1;
}
+ if (options->AuthoritativeDir && options->NoPublish) {
+ log(LOG_WARN, "You cannot set both AuthoritativeDir and NoPublish.");
+ result = -1;
+ }
+
if (options->ConnLimit <= 0) {
log(LOG_WARN, "ConnLimit must be greater than 0, but was set to %d",
options->ConnLimit);