nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-11-09 11:03:20 -05:00
commit 8adec87050
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug4426 Normal file
View File

@ -0,0 +1,8 @@
o Minor features:
- When Tor ignores a hidden service specified in its
configuration, include the hidden service's directory in the
warning message. Previously, we would only tell the user that
some hidden service was ignored. Bugfix on 0.0.6; fixes bug
4426.

9
src/or/rendservice.c
View File

@ -171,14 +171,17 @@ rend_add_service(rend_service_t *service)
if (service->auth_type != REND_NO_AUTH && if (service->auth_type != REND_NO_AUTH &&
smartlist_len(service->clients) == 0) { smartlist_len(service->clients) == 0) {
log_warn(LD_CONFIG, "Hidden service with client authorization but no " log_warn(LD_CONFIG, "Hidden service (%s) with client authorization but no "
"clients; ignoring."); "clients; ignoring.",
esc_for_log(service->directory));
rend_service_free(service); rend_service_free(service);
return; return;
} }
if (!smartlist_len(service->ports)) { if (!smartlist_len(service->ports)) {
log_warn(LD_CONFIG, "Hidden service with no ports configured; ignoring."); log_warn(LD_CONFIG, "Hidden service (%s) with no ports configured; "
"ignoring.",
esc_for_log(service->directory));
rend_service_free(service); rend_service_free(service);
} else { } else {
int dupe = 0; int dupe = 0;