sandbox: Allow DirPortFrontPage unconditionally if it's set

fixes 12114; bug not in any release.

Improves fix for 12028
This commit is contained in:
Nick Mathewson 2014-05-27 19:21:11 -04:00
parent ba9946dda7
commit 14842de9a7

View File

@ -2870,6 +2870,11 @@ sandbox_init_filter(void)
} }
} }
if (options->DirPortFrontPage) {
sandbox_cfg_allow_open_filename(&cfg,
tor_strdup(options->DirPortFrontPage));
}
// orport // orport
if (server_mode(get_options())) { if (server_mode(get_options())) {
sandbox_cfg_allow_open_filename_array(&cfg, sandbox_cfg_allow_open_filename_array(&cfg,
@ -2905,11 +2910,6 @@ sandbox_init_filter(void)
NULL, 0 NULL, 0
); );
if (options->DirPortFrontPage) {
sandbox_cfg_allow_open_filename(&cfg,
tor_strdup(options->DirPortFrontPage));
}
RENAME_SUFFIX("fingerprint", ".tmp"); RENAME_SUFFIX("fingerprint", ".tmp");
RENAME_SUFFIX2("keys", "secret_onion_key_ntor", ".tmp"); RENAME_SUFFIX2("keys", "secret_onion_key_ntor", ".tmp");
RENAME_SUFFIX2("keys", "secret_id_key", ".tmp"); RENAME_SUFFIX2("keys", "secret_id_key", ".tmp");