[or-cvs] r13683: Make "HashedControlPassword" an alias for "__HashedControlSe (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-02-22 18:20:28 -0500 (Fri, 22 Feb 2008)
New Revision: 13683

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
Make "HashedControlPassword" an alias for "__HashedControlSessionPassword"
if it appears on the commandline. should help with bug 586.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-02-22 23:04:26 UTC (rev 13682)
+++ tor/trunk/ChangeLog	2008-02-22 23:20:28 UTC (rev 13683)
@@ -47,8 +47,10 @@
 
   o Minor features (controller):
     - Add a new __HashedControlSessionPassword option for controllers
-      to use for one-off session password hashes that shouldn't get
-      saved to disk by SAVECONF.  Partial fix for bug 586.
+      to use for one-off session password hashes that shouldn't
+      get saved to disk by SAVECONF. Make Tor automatically convert
+      "HashedControlPassword" to this new option but only when it's
+      given on the command line. Partial fix for bug 586.
 
   o Minor features (logging):
     - When SafeLogging is disabled, log addresses along with all TLS

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2008-02-22 23:04:26 UTC (rev 13682)
+++ tor/trunk/src/or/config.c	2008-02-22 23:20:28 UTC (rev 13683)
@@ -84,6 +84,7 @@
   { "SearchDomains", "ServerDNSSearchDomains", 0, 1},
   { "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0},
   { "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0},
+  { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0},
   { NULL, NULL, 0, 0},
 };
 /* A list of state-file abbreviations, for compatibility. */