diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-09 11:03:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-09 11:03:20 -0500 |
| commit | 8adec8705014ef7e788a1dcf5d3a4a2d85a328ed (patch) | |
| tree | 388b887370c860fb5f8478079838a13d11de54dd | |
| parent | 0cc7a63fc0f8e23e0dc01a36de9a369671bdd4d5 (diff) | |
| parent | 565463243c4e019bfd8dff965582f02a2aa05e14 (diff) | |
| download | tor-8adec8705014ef7e788a1dcf5d3a4a2d85a328ed.tar.gz tor-8adec8705014ef7e788a1dcf5d3a4a2d85a328ed.zip | |
Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2
| -rw-r--r-- | changes/bug4426 | 8 | ||||
| -rw-r--r-- | src/or/rendservice.c | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/changes/bug4426 b/changes/bug4426 new file mode 100644 index 0000000000..1322243d09 --- /dev/null +++ b/changes/bug4426 @@ -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. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0f5731912d..25695c5e68 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -171,14 +171,17 @@ rend_add_service(rend_service_t *service) if (service->auth_type != REND_NO_AUTH && smartlist_len(service->clients) == 0) { - log_warn(LD_CONFIG, "Hidden service with client authorization but no " - "clients; ignoring."); + log_warn(LD_CONFIG, "Hidden service (%s) with client authorization but no " + "clients; ignoring.", + esc_for_log(service->directory)); rend_service_free(service); return; } 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); } else { int dupe = 0; |