diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-29 12:37:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-29 12:37:08 -0400 |
| commit | 9164d7c75e6191828db15ac713843932867158ef (patch) | |
| tree | f98a0ae55cccb9cfaecb2371bdfc9d3378451646 /src/app | |
| parent | 75f94ea1ec72df18d0f4435ee110bd667c9a142f (diff) | |
| parent | 0c8c295963b5389684d3b41e9260f7fbba4dfe2a (diff) | |
| download | tor-9164d7c75e6191828db15ac713843932867158ef.tar.gz tor-9164d7c75e6191828db15ac713843932867158ef.zip | |
Merge branch 'maint-0.4.4'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c index e09b003b42..31a4f141ad 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -849,8 +849,10 @@ sandbox_init_filter(void) OPEN_DATADIR2(name, name2 suffix); \ } while (0) +// KeyDirectory is a directory, but it is only opened in check_private_dir +// which calls open instead of opendir #define OPEN_KEY_DIRECTORY() \ - OPENDIR(options->KeyDirectory) + OPEN(options->KeyDirectory) #define OPEN_CACHEDIR(name) \ sandbox_cfg_allow_open_filename(&cfg, get_cachedir_fname(name)) #define OPEN_CACHEDIR_SUFFIX(name, suffix) do { \ @@ -864,7 +866,9 @@ sandbox_init_filter(void) OPEN_KEYDIR(name suffix); \ } while (0) - OPENDIR(options->DataDirectory); + // DataDirectory is a directory, but it is only opened in check_private_dir + // which calls open instead of opendir + OPEN(options->DataDirectory); OPEN_KEY_DIRECTORY(); OPEN_CACHEDIR_SUFFIX("cached-certs", ".tmp"); |