From 260bc80afeee4d76c53cf5c5551bb91984fdf5ce Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Thu, 18 Jul 2013 07:09:49 +0200
Subject: [PATCH] Get default user/password in every case.

Tweaks to fetching user/password from namecoin.conf that should now
always set values (in particular even if namecoin.conf is there but
has no rpcuser / rpcpassword set).
---
 src/namecoin.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/namecoin.py b/src/namecoin.py
index 02f80639..57059a1c 100644
--- a/src/namecoin.py
+++ b/src/namecoin.py
@@ -246,6 +246,8 @@ def ensureNamecoinOptions ():
     hasPort = shared.config.has_option (configSection, "namecoinrpcport")
 
     # Try to read user/password from .namecoin configuration file.
+    defaultUser = ""
+    defaultPass = ""
     try:
         nmcFolder = lookupNamecoinFolder ()
         nmcConfig = nmcFolder + "namecoin.conf"
@@ -261,23 +263,22 @@ def ensureNamecoinOptions ():
                 val = parts[1].rstrip ()
 
                 if key == "rpcuser" and not hasUser:
-                    shared.config.set (configSection,
-                                       "namecoinrpcuser", val)
+                    defaultUser = val
                 if key == "rpcpassword" and not hasPass:
-                    shared.config.set (configSection,
-                                       "namecoinrpcpassword", val)
+                    defaultPass = val
                 if key == "rpcport":
                     shared.namecoinDefaultRpcPort = val
-                    # Will be set in config below anyway.
                 
         nmc.close ()
 
     except Exception as exc:
         print "Failure reading namecoin config file: %s" % str (exc)
-        if (not hasUser):
-            shared.config.set (configSection, "namecoinrpcuser", "")
-        if (not hasPass):
-            shared.config.set (configSection, "namecoinrpcpassword", "")
+
+    # If still nothing found, set empty at least.
+    if (not hasUser):
+        shared.config.set (configSection, "namecoinrpcuser", defaultUser)
+    if (not hasPass):
+        shared.config.set (configSection, "namecoinrpcpassword", defaultPass)
 
     # Set default port now, possibly to found value.
     if (not hasPort):