mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge branch 'absolute_cookie_file'
This commit is contained in:
commit
8d74fba651
3
changes/absolute_cookie_file
Normal file
3
changes/absolute_cookie_file
Normal 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.
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user