From 6b3ce66088007091a5f33c25676b93856451d59b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 28 Dec 2018 00:20:28 +0900 Subject: Fixed access to TDE wallets created before R14.0.6 that uses special non-ascii characters in their password. Signed-off-by: Michele Calgaro --- tdeio/misc/tdewalletd/tdewalletd.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 99288bc8c..0aaec0f9a 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -479,8 +479,13 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo p = kpd->password().utf8(); int rc = b->open(TQByteArray().duplicate(p, p.length())); if (!b->isOpen()) { - kpd->setPrompt(i18n("Error opening the wallet '%1'. Please try again.
(Error code %2: %3)").arg(TQStyleSheet::escape(wallet)).arg(rc).arg(TDEWallet::Backend::openRCToString(rc))); - kpd->clearPassword(); + // For compatibility with TDE << T14.0.6, try ascii() as fallback option in case of errors + p = kpd->password().ascii(); + rc = b->open(TQByteArray().duplicate(p, p.length())); + if (!b->isOpen()) { + kpd->setPrompt(i18n("Error opening the wallet '%1'. Please try again.
(Error code %2: %3)").arg(TQStyleSheet::escape(wallet)).arg(rc).arg(TDEWallet::Backend::openRCToString(rc))); + kpd->clearPassword(); + } } } else { break; -- cgit v1.2.3