aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_options_act.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-11-19 11:59:21 -0500
committerNick Mathewson <nickm@torproject.org>2019-11-20 09:26:47 -0500
commita30d143228b4211fd24093c244117e07e9409de5 (patch)
treeaba52010abb5f017930dcd99c33df1a4e32f2aae /src/test/test_options_act.c
parent3094651fa3c71429e8efb0e23087a78addd6728f (diff)
downloadtor-a30d143228b4211fd24093c244117e07e9409de5.tar.gz
tor-a30d143228b4211fd24093c244117e07e9409de5.zip
Make KeyDirectory's GroupReadable behave the same as CacheDirectory's.
In #26913 we solved a bug where CacheDirectoryGroupReadable would override DataDirectoryGroupReadable when the two directories are the same. We never did the same for KeyDirectory, though, because that's a rare setting. Now that I'm testing this code, though, fixing this issue seems fine. Fixes bug #27992; bugfix on 0.3.3.1-alpha.
Diffstat (limited to 'src/test/test_options_act.c')
-rw-r--r--src/test/test_options_act.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/test/test_options_act.c b/src/test/test_options_act.c
index aaef1d9110..abc1c65481 100644
--- a/src/test/test_options_act.c
+++ b/src/test/test_options_act.c
@@ -109,11 +109,7 @@ test_options_act_create_dirs(void *arg)
opts->KeyDirectory = tor_strdup(fn);
opts->DataDirectoryGroupReadable = 1;
opts->CacheDirectoryGroupReadable = -1; /* default. */
-#if 1
- /* Bug 27992: this setting shouldn't be needed, but for now it is, in the
- * unusual case that DataDirectory == KeyDirectory */
- opts->KeyDirectoryGroupReadable = 1;
-#endif
+ opts->KeyDirectoryGroupReadable = -1; /* default */
r = options_create_directories(&msg);
tt_int_op(r, OP_EQ, 0);
tt_ptr_op(msg, OP_EQ, NULL);