[or-cvs] r13778: forward-port r13777 (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-02-28 20:45:06 -0500 (Thu, 28 Feb 2008)
New Revision: 13778

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/control.c
Log:
forward-port r13777


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-02-29 01:43:44 UTC (rev 13777)
+++ tor/trunk/ChangeLog	2008-02-29 01:45:06 UTC (rev 13778)
@@ -81,7 +81,8 @@
   o Minor bugfixes (memory leaks and code problems):
     - We were leaking a file descriptor if Tor started with a zero-length
       cached-descriptors file. Patch by freddy77; bugfix on 0.1.2.
-    - Detect size overflow in zlib code. Reported by Dan Kaminsky.
+    - Detect size overflow in zlib code. Reported by Justin Ferguson and
+      Dan Kaminsky.
     - We were comparing the raw BridgePassword entry with a base64'ed
       version of it, when handling a "/tor/networkstatus-bridges"
       directory request. Now compare correctly. Noticed by Veracode.

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-02-29 01:43:44 UTC (rev 13777)
+++ tor/trunk/src/or/control.c	2008-02-29 01:45:06 UTC (rev 13778)
@@ -2541,7 +2541,8 @@
     char *esc_cfile = esc_for_log(cfile);
     char *methods;
     {
-      int passwd = (options->HashedControlPassword != NULL);
+      int passwd = (options->HashedControlPassword != NULL ||
+                    options->HashedControlSessionPassword != NULL);
       smartlist_t *mlist = smartlist_create();
       if (cookies)
         smartlist_add(mlist, (char*)"COOKIE");