diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-10 15:00:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-10 15:00:02 -0500 |
| commit | 8d74fba651dfb788568d2236da773ed9fd9b4a39 (patch) | |
| tree | 6620cee4b6eb569b543e8effcca6238224b53224 /src | |
| parent | dca3c9fff87227b8119afe804ce0ae8ed840b1f8 (diff) | |
| parent | 3085b76a0996d87ed32482f1023963ccbc28f4d3 (diff) | |
| download | tor-8d74fba651dfb788568d2236da773ed9fd9b4a39.tar.gz tor-8d74fba651dfb788568d2236da773ed9fd9b4a39.zip | |
Merge branch 'absolute_cookie_file'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index c9d3765ad3..3ba7bfeb4b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -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: |