From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jan 2012 18:20:48 +0000 (-0500)
Subject: Report cookie file location as absolute in protocolinfo message
X-Git-Tag: tor-0.2.3.11-alpha~31^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e14ce4dba168ad4564fa15d4e86b4f4e9d36655;p=thirdparty%2Ftor.git

Report cookie file location as absolute in protocolinfo message
---

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: