From: Robert Ransom <rransom.8774@gmail.com>
Date: Tue, 8 Nov 2011 01:02:50 +0000 (-0800)
Subject: Include HiddenServiceDir in some warning messages
X-Git-Tag: tor-0.2.3.8-alpha~47^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=565463243c4e019bfd8dff965582f02a2aa05e14;p=thirdparty%2Ftor.git

Include HiddenServiceDir in some warning messages
---

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;