[or-cvs] [tor/maint-0.2.2] Ignore and warn about "PublishServerDescriptor hidserv"

[nickm at torproject.org]

commit 7bf06d4a4f390aa866f9137b364632f5d6f3df8a
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Tue Jan 18 03:54:56 2011 -0800

    Ignore and warn about "PublishServerDescriptor hidserv"
    
    Fixes #2408.
---
 changes/bug2408 |    6 ++++++
 src/or/config.c |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/changes/bug2408 b/changes/bug2408
new file mode 100644
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 a955b17..8397b23 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