commit 4e14ce4dba168ad4564fa15d4e86b4f4e9d36655 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 9 13:20:48 2012 -0500

Report cookie file location as absolute in protocolinfo message --- 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 c9d3765..3ba7bfe 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: