tor

commit 6f47734ea8dde2d05160644dfcfcd34ee1a63505
parent 8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 14 Sep 2018 12:56:30 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
A
changes/bug27335
 | 
4
++++
M
src/or/hs_service.c
 | 
6
+++---

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/bug27335 b/changes/bug27335
@@ -0,0 +1,4 @@
+  o Minor bugfixes (hidden service v3):
+    - In case the hidden service directory can't be created or has wrong
+      permissions, do not BUG() on it which lead to a non fatal stacktrace.
+      Fixes bug 27335; bugfix on 0.3.2.1.
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
@@ -1005,9 +1005,9 @@ load_service_keys(hs_service_t *service)
    * files to that directory so make sure it exists and has the right
    * permissions. We do this here because at this stage we know that Tor is
    * actually running and the service we have has been validated. */
-  if (BUG(hs_check_service_private_dir(get_options()->User,
-                                       config->directory_path,
-                                       config->dir_group_readable, 1) < 0)) {
+  if (hs_check_service_private_dir(get_options()->User,
+                                   config->directory_path,
+                                   config->dir_group_readable, 1) < 0) {
     goto end;
   }