From 9a6fdbf7120a648ebb1f63d173defda7a454c7cf Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Mon, 6 Jul 2015 11:06:39 -0400
Subject: [PATCH] account: Fix setting certificates
The current code was part of a previous API sequence
Refs #76979
Change-Id: Ic26d71327d75a8e0fa88245a411b056cb23c585a
---
src/account.cpp | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/account.cpp b/src/account.cpp
index 2f658454..ca5f4ff9 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -1734,28 +1734,15 @@ void Account::setRoleData(int role, const QVariant& value)
setTlsPassword(value.toString());
break;
case CAST(Account::Role::TlsCaListCertificate): {
- const QString path = value.toString();
- if (!tlsCaListCertificate())
- setTlsCaListCertificate(path);
- else if ((tlsCaListCertificate() && tlsCaListCertificate()->path() != QUrl(path))) {
- tlsCaListCertificate()->setPath(path);
- }
+ setTlsCaListCertificate(value.toString());
break;
}
case CAST(Account::Role::TlsCertificate): {
- const QString path = value.toString();
- if (!tlsCertificate())
- setTlsCertificate(path);
- else if ((tlsCertificate() && tlsCertificate()->path() != QUrl(path)))
- tlsCertificate()->setPath(path);
+ setTlsCertificate(value.toString());
}
break;
case CAST(Account::Role::TlsPrivateKeyCertificate): {
- const QString path = value.toString();
- if (!tlsPrivateKeyCertificate())
- setTlsPrivateKeyCertificate(path);
- else if ((tlsPrivateKeyCertificate() && tlsPrivateKeyCertificate()->path() != QUrl(path)))
- tlsPrivateKeyCertificate()->setPath(path);
+ setTlsPrivateKeyCertificate(value.toString());
}
break;
case CAST(Account::Role::TlsServerName):
--
GitLab