aboutsummaryrefslogtreecommitdiff
path: root/src/or/ext_orport.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-07-16 13:42:25 -0400
committerNick Mathewson <nickm@torproject.org>2013-08-15 12:03:34 -0400
commite4a241af11dce61d8722b74ad41d6ea0bec44ef1 (patch)
tree7add7b7b25cd07121ff9eead63d8627a513130f0 /src/or/ext_orport.c
parent656842441039399aca0dee95b7c51be7a3749ce0 (diff)
downloadtor-e4a241af11dce61d8722b74ad41d6ea0bec44ef1.tar
tor-e4a241af11dce61d8722b74ad41d6ea0bec44ef1.tar.gz
Add guards to ext_orport.h, rename get_file to get_file_name
Diffstat (limited to 'src/or/ext_orport.c')
-rw-r--r--src/or/ext_orport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index 8fd9b77c8..cd8ab2d04 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -113,7 +113,7 @@ static char ext_or_auth_cookie[EXT_OR_PORT_AUTH_COOKIE_LEN] = {0};
/** Helper: Return a newly allocated string containing a path to the
* file where we store our authentication cookie. */
char *
-get_ext_or_auth_cookie_file(void)
+get_ext_or_auth_cookie_file_name(void)
{
const or_options_t *options = get_options();
if (options->ExtORPortCookieAuthFile &&
@@ -153,7 +153,7 @@ init_ext_or_cookie_authentication(int is_enabled)
memcpy(cookie_file_string+EXT_OR_PORT_AUTH_COOKIE_HEADER_LEN,
ext_or_auth_cookie, EXT_OR_PORT_AUTH_COOKIE_LEN);
- fname = get_ext_or_auth_cookie_file();
+ fname = get_ext_or_auth_cookie_file_name();
if (write_bytes_to_file(fname, cookie_file_string,
EXT_OR_PORT_AUTH_COOKIE_FILE_LEN, 1)) {
log_warn(LD_FS,"Error writing authentication cookie to %s.",