瀏覽代碼

sandbox: Allow DirPortFrontPage unconditionally if it's set

fixes 12114; bug not in any release.

Improves fix for 12028
Nick Mathewson 10 年之前
父節點
當前提交
14842de9a7
共有 1 個文件被更改,包括 5 次插入5 次删除
  1. 5 5
      src/or/main.c

+ 5 - 5
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");