Commit 8adec870 authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

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

parents 0cc7a63f 56546324

changes/bug4426

0 → 100644
+8 −0
Changes for changes/bug4426: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  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.

src/or/rendservice.c

+6 −3
Changes for src/or/rendservice.c: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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;