[or-cvs] r22557: {arm} fix: crashing issue when parsing config entry for password (arm/trunk/init)

[Damian Johnson]

Author: atagar
Date: 2010-06-26 22:10:52 +0000 (Sat, 26 Jun 2010)
New Revision: 22557

Modified:
   arm/trunk/init/starter.py
Log:
fix: crashing issue when parsing config entry for password



Modified: arm/trunk/init/starter.py
===================================================================
--- arm/trunk/init/starter.py	2010-06-26 22:03:30 UTC (rev 22556)
+++ arm/trunk/init/starter.py	2010-06-26 22:10:52 UTC (rev 22557)
@@ -168,7 +168,7 @@
   # sets up TorCtl connection, prompting for the passphrase if necessary and
   # sending problems to stdout if they arise
   util.torTools.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath
-  authPassword = config.get(DEFAULTS["startup.controlPassword"], None)
+  authPassword = config.get("startup.controlPassword", DEFAULTS["startup.controlPassword"])
   conn = util.torTools.connect(controlAddr, controlPort, authPassword)
   if conn == None: sys.exit(1)