commit 14842de9a731b6bbb348583645a31a3f3ab68af8 Author: Nick Mathewson nickm@torproject.org Date: Tue May 27 19:21:11 2014 -0400

sandbox: Allow DirPortFrontPage unconditionally if it's set

fixes 12114; bug not in any release.

Improves fix for 12028 --- src/or/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c index 8b79c42..a3be9a2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2870,6 +2870,11 @@ sandbox_init_filter(void) } }

+ if (options->DirPortFrontPage) { + sandbox_cfg_allow_open_filename(&cfg, + tor_strdup(options->DirPortFrontPage)); + } + // orport if (server_mode(get_options())) { sandbox_cfg_allow_open_filename_array(&cfg, @@ -2905,11 +2910,6 @@ sandbox_init_filter(void) NULL, 0 );

- if (options->DirPortFrontPage) { - sandbox_cfg_allow_open_filename(&cfg, - tor_strdup(options->DirPortFrontPage)); - } - RENAME_SUFFIX("fingerprint", ".tmp"); RENAME_SUFFIX2("keys", "secret_onion_key_ntor", ".tmp"); RENAME_SUFFIX2("keys", "secret_id_key", ".tmp");