summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2012-12-05 18:19:44 +0200
committerNick Mathewson <nickm@torproject.org>2013-07-18 14:59:55 -0400
commitd303228ecae1d4c5d9a242b12a4546366544a170 (patch)
treee0e1e5dcd39ec95cea27dc82cc95aac4e04a6005 /src/or/config.c
parentba30d635c5efbbb6a9455925720196b9d56163f6 (diff)
downloadtor-d303228ecae1d4c5d9a242b12a4546366544a170.tar.gz
tor-d303228ecae1d4c5d9a242b12a4546366544a170.zip
Create the Extended ORPort authentication cookie file.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index afdee3d3d4..6dad0194e7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1474,8 +1474,14 @@ options_act(const or_options_t *old_options)
return -1;
}
- if (init_cookie_authentication(options->CookieAuthentication) < 0) {
- log_warn(LD_CONFIG,"Error creating cookie authentication file.");
+ if (init_control_auth_cookie_authentication(options->CookieAuthentication) < 0) {
+ log_warn(LD_CONFIG,"Error creating control cookie authentication file.");
+ return -1;
+ }
+
+ /* If we have an ExtORPort, initialize its auth cookie. */
+ if (init_ext_or_auth_cookie_authentication(!!options->ExtORPort_lines) < 0) {
+ log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file.");
return -1;
}