[vidalia-svn] r3294: Stop putting 'HashedControlPassword ""' on the Tor command l (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-11-11 23:23:14 -0500 (Tue, 11 Nov 2008)
New Revision: 3294

Modified:
   vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
Stop putting 'HashedControlPassword ""' on the Tor command line if cookie or
no auth is enabled. It used to be there because Tor didn't like have both
cookie and password auth enabled at the same time. Now it just causes Tor to
log a confusing warning.


Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-11-12 02:25:05 UTC (rev 3293)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-11-12 04:23:14 UTC (rev 3294)
@@ -825,16 +825,13 @@
         _useSavedPassword = true;
       }
       args << "HashedControlPassword"
-           << TorSettings::hashPassword(_controlPassword)
-           << "CookieAuthentication"  << "0";
+           << TorSettings::hashPassword(_controlPassword);
       break;
     case TorSettings::CookieAuth:
-      args << "CookieAuthentication"  << "1"
-           << "HashedControlPassword" << "";
+      args << "CookieAuthentication"  << "1";
       break;
     default:
-      args << "CookieAuthentication"  << "0"
-           << "HashedControlPassword" << "";
+      args << "CookieAuthentication"  << "0";
   }
 
   /* This doesn't get set to false until Tor is actually up and running, so we