[or-cvs] r8681: When reporting verbose nicknames in entry_guards_getinfo(), (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2006-10-09 17:26:34 -0400 (Mon, 09 Oct 2006)
New Revision: 8681

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/circuitbuild.c
Log:
When reporting verbose nicknames in entry_guards_getinfo(), avoid
printing a duplicate "$" in the keys we send. (Reported by mwenge)


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-10-09 21:13:29 UTC (rev 8680)
+++ tor/trunk/ChangeLog	2006-10-09 21:26:34 UTC (rev 8681)
@@ -22,6 +22,8 @@
     - Fix handling of verbose nicknames with ORCONN controller events:
       make them show up exactly when requested, rather than exactly when
       not requested.
+    - When reporting verbose nicknames in entry_guards_getinfo(), avoid
+      printing a duplicate "$" in the keys we send.
 
 
 Changes in version 0.1.2.2-alpha - 2006-10-07

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2006-10-09 21:13:29 UTC (rev 8680)
+++ tor/trunk/src/or/circuitbuild.c	2006-10-09 21:26:34 UTC (rev 8681)
@@ -2481,9 +2481,9 @@
         }
         if (when) {
           format_iso_time(tbuf, when);
-          tor_snprintf(c, len, "$%s %s %s\n", nbuf, status, tbuf);
+          tor_snprintf(c, len, "%s %s %s\n", nbuf, status, tbuf);
         } else {
-          tor_snprintf(c, len, "$%s %s\n", nbuf, status);
+          tor_snprintf(c, len, "%s %s\n", nbuf, status);
         }
         smartlist_add(sl, c);
       });