Ignore and warn about "PublishServerDescriptor hidserv"

Fixes #2408.

diff --git a/changes/bug2408 b/changes/bug2408
new file mode 100644 (file)
index 0000000..1d2dbf1
--- /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 a955b1728bca45fe7de56b7f00131e8aba90b575..8397b231a3c06753cc856ec2d5b259bf5ab66d20 100644 (file)
--- 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