diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-18 20:22:31 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-18 20:22:31 +0200 |
| commit | 50b8af5b45e44f87362484d720abf3300ce3aa94 (patch) | |
| tree | 701896339785cbb8e4235a26c4a55e0e5abd5933 /src/cryptonote_basic/cryptonote_basic_impl.cpp | |
| parent | c642d3224c65c993ded9423358c818b83b7d74b9 (diff) | |
| parent | 250c4cb3e08375f88942f46a3939d050d5c9ebd2 (diff) | |
| download | monzero-core-50b8af5b45e44f87362484d720abf3300ce3aa94.tar.gz monzero-core-50b8af5b45e44f87362484d720abf3300ce3aa94.tar.xz monzero-core-50b8af5b45e44f87362484d720abf3300ce3aa94.zip | |
Merge pull request #1874
250c4cb3 wallet-rpc: enable openalias (stoffu)
Diffstat (limited to 'src/cryptonote_basic/cryptonote_basic_impl.cpp')
| -rw-r--r-- | src/cryptonote_basic/cryptonote_basic_impl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cryptonote_basic/cryptonote_basic_impl.cpp b/src/cryptonote_basic/cryptonote_basic_impl.cpp index fb9e25c00..edd67793f 100644 --- a/src/cryptonote_basic/cryptonote_basic_impl.cpp +++ b/src/cryptonote_basic/cryptonote_basic_impl.cpp @@ -308,12 +308,13 @@ namespace cryptonote { , crypto::hash8& payment_id , bool testnet , const std::string& str_or_url + , bool cli_confirm ) { if (get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, str_or_url)) return true; bool dnssec_valid; - std::string address_str = tools::dns_utils::get_account_address_as_str_from_url(str_or_url, dnssec_valid); + std::string address_str = tools::dns_utils::get_account_address_as_str_from_url(str_or_url, dnssec_valid, cli_confirm); return !address_str.empty() && get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, address_str); } @@ -322,11 +323,12 @@ namespace cryptonote { cryptonote::account_public_address& address , bool testnet , const std::string& str_or_url + , bool cli_confirm ) { bool has_payment_id; crypto::hash8 payment_id; - return get_account_address_from_str_or_url(address, has_payment_id, payment_id, testnet, str_or_url); + return get_account_address_from_str_or_url(address, has_payment_id, payment_id, testnet, str_or_url, cli_confirm); } //-------------------------------------------------------------------------------- bool operator ==(const cryptonote::transaction& a, const cryptonote::transaction& b) { |