Include HiddenServiceDir in some warning messages

This commit is contained in:
Robert Ransom 2011-11-07 17:02:50 -08:00
parent 8ba1cf3007
commit 565463243c
2 changed files with 14 additions and 3 deletions

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.

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;