aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-05-27 19:21:11 -0400
committerNick Mathewson <nickm@torproject.org>2014-05-27 19:21:11 -0400
commit14842de9a731b6bbb348583645a31a3f3ab68af8 (patch)
tree2e64d562f8b1466094dde6aba79949b9e188a10d /src/or
parentba9946dda702162f2fc7c35d79825604433eb0a9 (diff)
downloadtor-14842de9a731b6bbb348583645a31a3f3ab68af8.tar
tor-14842de9a731b6bbb348583645a31a3f3ab68af8.tar.gz
sandbox: Allow DirPortFrontPage unconditionally if it's set
fixes 12114; bug not in any release. Improves fix for 12028
Diffstat (limited to 'src/or')
-rw-r--r--src/or/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 8b79c4273..a3be9a20d 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");