summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-01-18 03:54:56 -0800
committerRobert Ransom <rransom.8774@gmail.com>2011-02-09 02:33:24 -0800
commit7bf06d4a4f390aa866f9137b364632f5d6f3df8a (patch)
tree0a0eb7c3a31328a79d5974874486f39c6cb83fce
parentbcbcda309a24ebe9022ad47c023af12877535780 (diff)
downloadtor-7bf06d4a4f390aa866f9137b364632f5d6f3df8a.tar.gz
tor-7bf06d4a4f390aa866f9137b364632f5d6f3df8a.zip
Ignore and warn about "PublishServerDescriptor hidserv"
Fixes #2408.
-rw-r--r--changes/bug24086
-rw-r--r--src/or/config.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug2408 b/changes/bug2408
new file mode 100644
index 0000000000..1d2dbf1ad6
--- /dev/null
+++ b/changes/bug2408
@@ -0,0 +1,6 @@
+ o Major bugfixes
+ - Ignore and warn about "PublishServerDescriptor hidserv" torrc
+ options. The 'hidserv' argument never controlled publication
+ of hidden service descriptors. Bugfix on 0.2.0.1-alpha.
+
+
diff --git a/src/or/config.c b/src/or/config.c
index a955b1728b..8397b231a3 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2878,7 +2878,9 @@ compute_publishserverdescriptor(or_options_t *options)
else if (!strcasecmp(string, "bridge"))
*auth |= BRIDGE_AUTHORITY;
else if (!strcasecmp(string, "hidserv"))
- *auth |= HIDSERV_AUTHORITY;
+ log_warn(LD_CONFIG,
+ "PublishServerDescriptor hidserv is invalid. See "
+ "PublishHidServDescriptors.");
else if (!strcasecmp(string, "") || !strcmp(string, "0"))
/* no authority */;
else