summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-09-17 11:36:59 -0400
committerNick Mathewson <nickm@torproject.org>2018-09-17 11:44:59 -0400
commit4fd761a418558c05716b4a04a5306dc67ce53dfe (patch)
treecb036fcbf7d0d727b6727e5cd490679ae2dc7b8e /doc
parenta546e07600151be275e6134407c2bcb833a3dd97 (diff)
downloadtor-4fd761a418558c05716b4a04a5306dc67ce53dfe.tar.gz
tor-4fd761a418558c05716b4a04a5306dc67ce53dfe.zip
Make CacheDirectoryGroupReadable an autobool.
Since the default cache directory is the same as the default data directory, we don't want the default CacheDirectoryGroupReadable value (0) to override an explicitly set "DataDirectoryGroupReadable 1". To fix this, I'm making CacheDirectoryGroupReadable into an autobool, and having the default (auto) value mean "Use the value of DataDirectoryGroupReadable if the directories are the same, and 0 otherwise." Fixes bug 26913; bugfix on 0.3.3.1-alpha when the CacheDirectory option was introduced.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f894061808..c089bffbb0 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -423,10 +423,12 @@ GENERAL OPTIONS
running.
(Default: uses the value of DataDirectory.)
-[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**::
+[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**|**auto**::
If this option is set to 0, don't allow the filesystem group to read the
CacheDirectory. If the option is set to 1, make the CacheDirectory readable
- by the default GID. (Default: 0)
+ by the default GID. If the option is "auto", then we use the
+ setting for DataDirectoryGroupReadable when the CacheDirectory is the
+ same as the DataDirectory, and 0 otherwise. (Default: auto)
[[FallbackDir]] **FallbackDir** __ipv4address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__] [ipv6=**[**__ipv6address__**]**:__orport__]::
When we're unable to connect to any directory cache for directory info