diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-11 00:35:25 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-11 00:35:25 +0200 |
| commit | eacf2124b6822d088199179b18d4587404408e0f (patch) | |
| tree | 48982250b525de443794c218d5386df03e728965 /src/simplewallet | |
| parent | Merge pull request #1686 (diff) | |
| parent | Add server auth to monerod, and client auth to wallet-cli and wallet-rpc (diff) | |
| download | monero-eacf2124b6822d088199179b18d4587404408e0f.tar.xz | |
Merge pull request #1689
ce7fcbb4 Add server auth to monerod, and client auth to wallet-cli and wallet-rpc (Lee Clagett)
Diffstat (limited to 'src/simplewallet')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 2 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 890ec2168..71a03d208 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1192,7 +1192,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm) } catch (const std::exception &e) { } - m_http_client.set_server(m_wallet->get_daemon_address()); + m_http_client.set_server(m_wallet->get_daemon_address(), m_wallet->get_daemon_login()); m_wallet->callback(this); return true; } diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index 94e442f70..efa748b0d 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -44,7 +44,7 @@ #include "cryptonote_basic/cryptonote_basic_impl.h" #include "wallet/wallet2.h" #include "console_handler.h" -#include "wallet/password_container.h" +#include "common/password.h" #include "crypto/crypto.h" // for definition of crypto::secret_key #undef MONERO_DEFAULT_LOG_CATEGORY |