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 | a546e07600151be275e6134407c2bcb833a3dd97 (patch) | |
| tree | ac22c45a6748084886e346a4b6ae817448f8138f | |
| parent | 281854bab7001cc838c91b521b41b666140e124f (diff) | |
| parent | 0971b3ce4d03929ef09838209ab87de4f9dfcf1f (diff) | |
| download | tor-a546e07600151be275e6134407c2bcb833a3dd97.tar.gz tor-a546e07600151be275e6134407c2bcb833a3dd97.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -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 e7abf715ad..4c67aff429 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -983,9 +983,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; } |