summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorChris Ball <chris@printf.net>2010-07-31 19:42:29 -0400
committerNick Mathewson <nickm@torproject.org>2010-08-02 12:04:04 -0400
commit9ffa9779819bfba33a6a9fdd888aeb52c99d00d9 (patch)
tree3890168cdfc809dfdb8e09eee8260f50ef9d0434 /src/or/config.c
parent600ba86f4a1d15ae6037246a1715f995e4b0f5b0 (diff)
downloadtor-9ffa9779819bfba33a6a9fdd888aeb52c99d00d9.tar.gz
tor-9ffa9779819bfba33a6a9fdd888aeb52c99d00d9.zip
Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index fc8455656b..20ae9f072f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3590,6 +3590,9 @@ options_validate(or_options_t *old_options, or_options_t *options,
}
});
+ if (options->BridgeRelay == 1 && options->ORPort == 0)
+ REJECT("BridgeRelay is 1, ORPort is 0. This is an invalid combination.");
+
return 0;
#undef REJECT
#undef COMPLAIN