aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-15 08:30:44 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-15 08:30:44 -0400
commit0808ed83f9cf312abe229d0956f0b0132a79962d (patch)
tree215177990944cdf14d0f72fdc1566d8287299fa0 /src/or/control.c
parentd443658fade3b4090d0b93903b4aec857cab03ea (diff)
downloadtor-0808ed83f9cf312abe229d0956f0b0132a79962d.tar.gz
tor-0808ed83f9cf312abe229d0956f0b0132a79962d.zip
Restore functionality for CookieAuthFileGroupReadable.
When we merged the cookieauthfile creation logic in 33c3e60a37, we accidentally took out this feature. Fixes bug 12864, bugfix on 0.2.5.1-alpha. Also adds an ExtORPortCookieAuthFileGroupReadable, since there's no reason not to.
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 9285fc564a..ec63506194 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4666,6 +4666,7 @@ init_control_cookie_authentication(int enabled)
fname = get_controller_cookie_file_name();
retval = init_cookie_authentication(fname, "", /* no header */
AUTHENTICATION_COOKIE_LEN,
+ get_options()->CookieAuthFileGroupReadable,
&authentication_cookie,
&authentication_cookie_is_set);
tor_free(fname);