summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2022-10-31 15:00:15 -0400
committerDavid Goulet <dgoulet@torproject.org>2022-10-31 15:00:15 -0400
commitf0e0957080b51a31bbc94178accf84cdba774ce5 (patch)
tree9e0846fd42b26504f2c17e5329069f32fec5e8f6
parentfb15bf94f222119c8993632f372b5deb9b7259a0 (diff)
parent619dd35321c13684d5496b660a3404d2d3fe2827 (diff)
downloadtor-f0e0957080b51a31bbc94178accf84cdba774ce5.tar.gz
tor-f0e0957080b51a31bbc94178accf84cdba774ce5.zip
Merge branch 'maint-0.4.7' into release-0.4.7
-rw-r--r--changes/ticket406633
-rw-r--r--src/app/main/main.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/ticket40663 b/changes/ticket40663
new file mode 100644
index 0000000000..3992d8e2b5
--- /dev/null
+++ b/changes/ticket40663
@@ -0,0 +1,3 @@
+ o Minor bugfixes (authorities, sandbox):
+ - Allow to write file my-consensus-<flavor-name> to disk when sandbox is
+ activated. Fixes bug 40663; bugfix on 0.3.5.1-alpha.
diff --git a/src/app/main/main.c b/src/app/main/main.c
index b73d722963..7fb92c59db 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -922,8 +922,11 @@ sandbox_init_filter(void)
if (options->BridgeAuthoritativeDir)
OPEN_DATADIR_SUFFIX("networkstatus-bridges", ".tmp");
- if (authdir_mode(options))
+ if (authdir_mode(options)) {
OPEN_DATADIR("approved-routers");
+ OPEN_CACHEDIR_SUFFIX("my-consensus-microdesc", ".tmp");
+ OPEN_CACHEDIR_SUFFIX("my-consensus-ns", ".tmp");
+ }
if (options->ServerDNSResolvConfFile)
sandbox_cfg_allow_open_filename(&cfg,