aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-10-25 13:44:31 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-10-25 13:44:31 -0500
commit711625c4671705259f5fc986286333f4ce461ca5 (patch)
tree89321622b86b51c170aa654f03136882bbe11eb3
parent59439f8113ca9aa1cceb2416d9fbb8b6d49f2610 (diff)
parent93e74269b31965505bdcc39e307a94d91b00e2bb (diff)
downloadmonzero-core-711625c4671705259f5fc986286333f4ce461ca5.tar.gz
monzero-core-711625c4671705259f5fc986286333f4ce461ca5.tar.xz
monzero-core-711625c4671705259f5fc986286333f4ce461ca5.zip
Merge pull request #6014
93e7426 wallet2: error out when we need a daemon password but have no prompt function (moneromooo-monero)
-rw-r--r--src/wallet/wallet2.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index f50720a77..9b3e7e8b4 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -390,6 +390,11 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl
{
auto parsed = tools::login::parse(
command_line::get_arg(vm, opts.daemon_login), false, [password_prompter](bool verify) {
+ if (!password_prompter)
+ {
+ MERROR("Password needed without prompt function");
+ return boost::optional<tools::password_container>();
+ }
return password_prompter("Daemon client password", verify);
}
);