Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kleopatra
Commits
fa20a4de
Commit
fa20a4de
authored
May 20, 2021
by
Ingo Klöcker
Browse files
Use getCryptoConfigEntry() helper to get configured keyserver
GnuPG-bug-id: 4876
parent
e7a526cc
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/view/p15cardwidget.cpp
View file @
fa20a4de
...
...
@@ -25,6 +25,7 @@
#include <KLocalizedString>
#include <KSeparator>
#include <Libkleo/Compat>
#include <Libkleo/KeyCache>
#include <Libkleo/Formatting>
#include <Libkleo/GnuPG>
...
...
@@ -104,8 +105,7 @@ void P15CardWidget::searchPGPFpr(const std::string &fpr)
/* Only do auto import from LDAP */
auto
conf
=
QGpgME
::
cryptoConfig
();
Q_ASSERT
(
conf
);
const
QString
cmp
=
engineIsVersion
(
2
,
3
,
0
)
?
QStringLiteral
(
"dirmngr"
)
:
QStringLiteral
(
"gpg"
);
const
auto
entry
=
conf
->
entry
(
cmp
,
QStringLiteral
(
"Keyserver"
),
QStringLiteral
(
"keyserver"
));
const
auto
entry
=
getCryptoConfigEntry
(
conf
,
engineIsVersion
(
2
,
3
,
0
)
?
"dirmngr"
:
"gpg"
,
"keyserver"
);
if
(
!
entry
||
!
entry
->
stringValue
().
startsWith
(
QStringLiteral
(
"ldap"
)))
{
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment