Browse Source

Ignore and warn about "PublishServerDescriptor hidserv"

Fixes #2408.
Robert Ransom 13 years ago
parent
commit
7bf06d4a4f
2 changed files with 9 additions and 1 deletions
  1. 6 0
      changes/bug2408
  2. 3 1
      src/or/config.c

+ 6 - 0
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.
+
+

+ 3 - 1
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