aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-25 14:24:41 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-25 14:24:41 -0400
commitf8248abbd6c5e04037cedee29a8867700617acde (patch)
treec23af6c2e07fc5cf0a9c6fc0cb522bc759574687 /src/or/config.c
parentb0e1ddbd98038e3c7326970887c74f169701cf35 (diff)
downloadtor-f8248abbd6c5e04037cedee29a8867700617acde.tar
tor-f8248abbd6c5e04037cedee29a8867700617acde.tar.gz
Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS
Fixes bug 10849; bugfix on 0.2.1.1-alpha (I believe)
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index d5c568947..f6db98e66 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4049,6 +4049,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("If you set UseBridges, you must specify at least one bridge.");
if (options->UseBridges && !options->TunnelDirConns)
REJECT("If you set UseBridges, you must set TunnelDirConns.");
+ if (options->RendConfigLines &&
+ (!options->TunnelDirConns || !options->PreferTunneledDirConns))
+ REJECT("If you are running a hidden service, you must set TunnelDirConns "
+ "and PreferTunneledDirConns");
for (cl = options->Bridges; cl; cl = cl->next) {
if (parse_bridge_line(cl->value, 1)<0)