diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-01-10 11:15:32 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-01-10 11:15:32 -0500 |
| commit | 35e221688b2636c405332bc6140d6e5cc483b0bf (patch) | |
| tree | 2010ddb7714d1798e588664532377c8e4dd503ca | |
| parent | d456885dac3b5bdfff663ed502fd11f9e0d0e070 (diff) | |
| parent | 726e9ec0a3bd7bda889f9da87a226451315baeda (diff) | |
| download | tor-35e221688b2636c405332bc6140d6e5cc483b0bf.tar.gz tor-35e221688b2636c405332bc6140d6e5cc483b0bf.zip | |
Merge branch 'tor-gitlab/mr/675' into maint-0.4.7
| -rw-r--r-- | changes/ticket40729 | 3 | ||||
| -rw-r--r-- | src/app/main/main.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/changes/ticket40729 b/changes/ticket40729 new file mode 100644 index 0000000000..1c2d43d14f --- /dev/null +++ b/changes/ticket40729 @@ -0,0 +1,3 @@ + o Minor bugfixes (sandbox, authority): + - With the sandbox enabled, allow to write "my-consensus-{ns|microdesc}" and + to rename them as well. Fixes bug 40729; bugfix on 0.3.5.1-alpha. diff --git a/src/app/main/main.c b/src/app/main/main.c index 7fb92c59db..838e129d04 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -924,8 +924,8 @@ sandbox_init_filter(void) if (authdir_mode(options)) { OPEN_DATADIR("approved-routers"); - OPEN_CACHEDIR_SUFFIX("my-consensus-microdesc", ".tmp"); - OPEN_CACHEDIR_SUFFIX("my-consensus-ns", ".tmp"); + OPEN_DATADIR_SUFFIX("my-consensus-microdesc", ".tmp"); + OPEN_DATADIR_SUFFIX("my-consensus-ns", ".tmp"); } if (options->ServerDNSResolvConfFile) @@ -1004,6 +1004,11 @@ sandbox_init_filter(void) if (options->BridgeAuthoritativeDir) RENAME_SUFFIX("networkstatus-bridges", ".tmp"); + if (authdir_mode(options)) { + RENAME_SUFFIX("my-consensus-microdesc", ".tmp"); + RENAME_SUFFIX("my-consensus-ns", ".tmp"); + } + #define STAT_DATADIR(name) \ sandbox_cfg_allow_stat_filename(&cfg, get_datadir_fname(name)) |