diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-14 12:56:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-14 12:56:30 -0400 |
| commit | 6f47734ea8dde2d05160644dfcfcd34ee1a63505 (patch) | |
| tree | 73de173068239da77820281a9a9d3c744ca8ecc4 | |
| parent | 8f689e0eb2b9c7bd51e4ddfe5e9f57d72fb45385 (diff) | |
| parent | a546e07600151be275e6134407c2bcb833a3dd97 (diff) | |
| download | tor-6f47734ea8dde2d05160644dfcfcd34ee1a63505.tar.gz tor-6f47734ea8dde2d05160644dfcfcd34ee1a63505.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
| -rw-r--r-- | changes/bug27335 | 4 | ||||
| -rw-r--r-- | src/or/hs_service.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/changes/bug27335 b/changes/bug27335 new file mode 100644 index 0000000000..dcc55a945a --- /dev/null +++ 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 index bef6bb327d..1b6316dabe 100644 --- 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; } |