From bbbed20f1fe5dcfd64e3d2c6b284720bc8a0cba2 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 2 Oct 2019 17:41:43 -0400
Subject: [PATCH] jamiaccount: return directly if changePassword fails
Change-Id: I3d8a69fdbe13ab060923672eab3d110d1d24841f
---
src/jamidht/jamiaccount.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index f3b70f66a8..eb57130db4 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -787,7 +787,10 @@ bool
JamiAccount::changeArchivePassword(const std::string& password_old, const std::string& password_new)
{
try {
- accountManager_->changePassword(password_old, password_new);
+ if (!accountManager_->changePassword(password_old, password_new)) {
+ JAMI_ERR("[Account %s] Can't change archive password", getAccountID().c_str());
+ return false;
+ }
archiveHasPassword_ = not password_new.empty();
} catch (const std::exception& ex) {
JAMI_ERR("[Account %s] Can't change archive password: %s", getAccountID().c_str(), ex.what());
--
GitLab