Commit 64562c70 authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

For GnuPG <2.2.28 add hint that GnuPG 2.2.28 is required

Options that are not supported by the currently used version of GnuPG
are still configurable to allow usage of Kleopatra with different
versions of GnuPG. Older versions of gpgsm will simply ignore the options.

GnuPG-bug-id: 5465
parent c4e98668
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "kleo/keyserverconfig.h" #include "kleo/keyserverconfig.h"
#include "utils/algorithm.h" #include "utils/algorithm.h"
#include "utils/gnupg.h"
#include <KCollapsibleGroupBox> #include <KCollapsibleGroupBox>
#include <KConfigGroup> #include <KConfigGroup>
...@@ -125,6 +126,9 @@ class EditDirectoryServiceDialog::Private ...@@ -125,6 +126,9 @@ class EditDirectoryServiceDialog::Private
} }
{ {
auto radioButton = new QRadioButton{i18n("Authenticate via Active Directory")}; auto radioButton = new QRadioButton{i18n("Authenticate via Active Directory")};
if (!engineIsVersion(2, 2, 28, GpgME::GpgSMEngine)) {
radioButton->setText(i18n("Authenticate via Active Directory (requires GnuPG 2.2.28 or later)"));
}
radioButton->setToolTip(i18nc("@info:tooltip", radioButton->setToolTip(i18nc("@info:tooltip",
"On Windows, authenticate to the LDAP server using the Active Directory with the current user.")); "On Windows, authenticate to the LDAP server using the Active Directory with the current user."));
authenticationGroup->addButton(radioButton, static_cast<int>(KeyserverAuthentication::ActiveDirectory)); authenticationGroup->addButton(radioButton, static_cast<int>(KeyserverAuthentication::ActiveDirectory));
...@@ -162,6 +166,9 @@ class EditDirectoryServiceDialog::Private ...@@ -162,6 +166,9 @@ class EditDirectoryServiceDialog::Private
mainLayout->addWidget(authenticationWidget); mainLayout->addWidget(authenticationWidget);
auto securityWidget = new QGroupBox{i18n("Connection Security"), parent}; auto securityWidget = new QGroupBox{i18n("Connection Security"), parent};
if (!engineIsVersion(2, 2, 28, GpgME::GpgSMEngine)) {
securityWidget->setTitle(i18n("Connection Security (requires GnuPG 2.2.28 or later)"));
}
{ {
auto layout = new QVBoxLayout{securityWidget}; auto layout = new QVBoxLayout{securityWidget};
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment