[tor-commits] [tor/master] Include HiddenServiceDir in some warning messages

[nickm@xxxxxxxxxxxxxx]

commit 565463243c4e019bfd8dff965582f02a2aa05e14
Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date:   Mon Nov 7 17:02:50 2011 -0800

    Include HiddenServiceDir in some warning messages
---
 changes/bug4426      |    8 ++++++++
 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 0000000..1322243
--- /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 0f57319..25695c5 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;



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits