Linux daemon

GlobalBoost · Dec 5, 2018 · 4e912be · 4e912be
1 parent a0926fe
commit 4e912be
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
@@ -736,6 +736,7 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol,
 
 void StartRPCThreads()
 {
+//FIX
     strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
     if ((mapArgs["-rpcpassword"] == "") ||
         (mapArgs["-rpcuser"] == mapArgs["-rpcpassword"]))
@@ -766,6 +767,8 @@ void StartRPCThreads()
         return;
     }
 
+    printf("user=%s, passwd=%s", mapArgs["-rpcuser"] ,mapArgs["-rpcpassword"]);
+
     assert(rpc_io_service == NULL);
     rpc_io_service = new asio::io_service();
     rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23);

diff --git a/src/globalboostyd b/src/globalboostyd
diff --git a/src/init.cpp b/src/init.cpp
@@ -176,7 +176,11 @@ bool AppInit(int argc, char* argv[])
             Shutdown();
         }
         ReadConfigFile(mapArgs, mapMultiArgs);
-
+        //FIX
+// std::cout << "user=" << mapArgs["-rpcuser"] << endl;
+// std::cout << "passswd=" << mapArgs["-rpcpassword"] << endl;
+// std::cout << "server=" << mapArgs["-server"] << endl;
+// std::cout << "daemon=" << mapArgs["-daemon"] << endl;
         if (mapArgs.count("-?") || mapArgs.count("--help"))
         {
             // First part of help message is specific to globalboostyd / RPC client

diff --git a/src/qt/locale/bitcoin_ca.qm b/src/qt/locale/bitcoin_ca.qm
diff --git a/src/qt/locale/bitcoin_ca_ES.qm b/src/qt/locale/bitcoin_ca_ES.qm
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
@@ -240,6 +240,7 @@ Value listunspent(const Array& params, bool fHelp)
             if (ExtractDestination(pk, address))
             {
                 const CScriptID& hash = boost::get<const CScriptID&>(address);
+                const CScriptID& hash = boost::get<CScriptID>(address);
                 CScript redeemScript;
                 if (pwalletMain->GetCScript(hash, redeemScript))
                     entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));