From 7bf06d4a4f390aa866f9137b364632f5d6f3df8a Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Tue, 18 Jan 2011 03:54:56 -0800 Subject: [PATCH 1/3] Ignore and warn about "PublishServerDescriptor hidserv" Fixes #2408. --- changes/bug2408 | 6 ++++++ src/or/config.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 changes/bug2408 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 From 5fc6967956610111d8cf24792ddf000bd83b4b86 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Wed, 19 Jan 2011 13:38:40 -0800 Subject: [PATCH 2/3] Update documentation for PublishServerDescriptor --- doc/tor.1.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.in b/doc/tor.1.in index 1a72ebd09f..390e6c4ba0 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -907,7 +907,7 @@ This directive can be specified multiple times to bind to multiple addresses/ports. .LP .TP -\fBPublishServerDescriptor \fR\fB0\fR|\fB1\fR|\fBv1\fR|\fBv2\fR|\fBv3\fR|\fBbridge\fR|\fBhidserv\fR, ...\fP +\fBPublishServerDescriptor \fR\fB0\fR|\fB1\fR|\fBv1\fR|\fBv2\fR|\fBv3\fR|\fBbridge\fR, ...\fP This option is only considered if you have an ORPort defined. You can choose multiple arguments, separated by commas. From 20d493308a50d3acc10ba27ac78d4258045f8ede Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Wed, 9 Feb 2011 03:14:51 -0800 Subject: [PATCH 3/3] Update documentation for PublishServerDescriptor (0.2.2.x) --- doc/tor.1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 81f1ee6267..c0957fc236 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -882,9 +882,9 @@ is non-zero): specified in ORPort. (Default: 0.0.0.0) This directive can be specified multiple times to bind to multiple addresses/ports. -**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**:: +**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**,**...**:: This option specifies which descriptors Tor will publish when acting as - a relay or hidden service. You can + a relay. You can choose multiple arguments, separated by commas. + If this option is set to 0, Tor will not publish its @@ -892,7 +892,7 @@ is non-zero): out your server, or if you're using a Tor controller that handles directory publishing for you.) Otherwise, Tor will publish its descriptors of all type(s) specified. The default is "1", - which means "if running as a server or a hidden service, publish the + which means "if running as a server, publish the appropriate descriptors to the authorities". **ShutdownWaitLength** __NUM__::