Commit 1e45d02a authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Use keyserver() helper to check for configured LDAP keyserver

GnuPG-bug-id: 5672
parent c770b6e5
......@@ -30,7 +30,7 @@ option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
# Standalone build. Find / include everything necessary.
set(KF5_MIN_VERSION "5.87.0")
set(KMIME_VERSION "5.18.40")
set(LIBKLEO_VERSION "5.18.43")
set(LIBKLEO_VERSION "5.18.44")
set(QT_REQUIRED_VERSION "5.15.2")
set(GPGME_REQUIRED_VERSION "1.13.1")
set(BOOST_REQUIRED_VERSION "1.58")
......
......@@ -105,8 +105,7 @@ void P15CardWidget::searchPGPFpr(const std::string &fpr)
/* Only do auto import from LDAP */
auto conf = QGpgME::cryptoConfig();
Q_ASSERT (conf);
const auto entry = getCryptoConfigEntry(conf, engineIsVersion(2, 3, 0)? "dirmngr" : "gpg", "keyserver");
if (!entry || !entry->stringValue().startsWith(QStringLiteral("ldap"))) {
if (!Kleo::keyserver().startsWith(QLatin1String{"ldap"})) {
return;
}
mStatusLabel->setText(i18n("Searching in directory service..."));
......
Supports Markdown
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