torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'absolute_cookie_file'

Browse Source
This commit is contained in:
Nick Mathewson
2012-01-10 15:00:02 -05:00
parent dca3c9fff8 3085b76a09
commit 8d74fba651
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/absolute_cookie_file
+3
View File
@@ -0,0 +1,3 @@
o Minor features (controller):
- When reporting the path to the cookie file to the controller,
give an absolute path. Resolves ticket 4881.
src/or/control.c
+5 -1
View File
@@ -2944,8 +2944,11 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len,
const or_options_t *options = get_options();
int cookies = options->CookieAuthentication;
char *cfile = get_cookie_file();
char *esc_cfile = esc_for_log(cfile);
char *abs_cfile;
char *esc_cfile;
char *methods;
abs_cfile = make_path_absolute(cfile);
esc_cfile = esc_for_log(abs_cfile);
{
int passwd = (options->HashedControlPassword != NULL ||
options->HashedControlSessionPassword != NULL);
@@ -2971,6 +2974,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len,
escaped(VERSION));
tor_free(methods);
tor_free(cfile);
tor_free(abs_cfile);
tor_free(esc_cfile);
}
done: