[or-cvs] r22994: {arm} fix: dropping alias replacement when validating HashedContro (arm/trunk/interface)

[Damian Johnson <atagar1@xxxxxxxxx>]

Author: atagar
Date: 2010-08-19 16:39:15 +0000 (Thu, 19 Aug 2010)
New Revision: 22994

Modified:
   arm/trunk/interface/confPanel.py
Log:
fix: dropping alias replacement when validating HashedControlSessionPassword (either version issue or handled specially)



Modified: arm/trunk/interface/confPanel.py
===================================================================
--- arm/trunk/interface/confPanel.py	2010-08-19 16:31:33 UTC (rev 22993)
+++ arm/trunk/interface/confPanel.py	2010-08-19 16:39:15 UTC (rev 22994)
@@ -28,6 +28,8 @@
 # GETCONF aliases (from the _option_abbrevs struct of src/or/config.c)
 # fix for: https://trac.torproject.org/projects/tor/ticket/1798
 # TODO: remove if/when fixed in tor
+# TODO: the following alias entry doesn't work on Tor 0.2.1.19:
+# "HashedControlPassword": "__HashedControlSessionPassword"
 CONF_ALIASES = {"l": "Log",
                 "AllowUnverifiedNodes": "AllowInvalidNodes",
                 "AutomapHostSuffixes": "AutomapHostsSuffixes",
@@ -48,7 +50,6 @@
                 "ServerDNSAllowBrokenResolvConf": "ServerDNSAllowBrokenConfig",
                 "PreferTunnelledDirConns": "PreferTunneledDirConns",
                 "BridgeAuthoritativeDirectory": "BridgeAuthoritativeDir",
-                "HashedControlPassword": "__HashedControlSessionPassword",
                 "StrictEntryNodes": "StrictNodes",
                 "StrictExitNodes": "StrictNodes"}