From 1dca8c2b3c6d6aa3dfd4215c911207f08a3bf9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
Date: Thu, 17 Jun 2021 09:38:33 +0200
Subject: [PATCH] qt: Do not set empty base DN as query of keyserver URL

* lang/qt/src/qgpgmenewcryptoconfig.cpp (parseURL): Only set non-empty
base DN as URL query.
--

This makes it possible to differentiate an unset query from an empty
query.

GnuPG-bug-id: 5465
---
 lang/qt/src/qgpgmenewcryptoconfig.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
index 04289467..d2598809 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@@ -496,8 +496,10 @@ static QUrl parseURL(int mRealArgType, const QString &str)
                 const QString passWord = urlpart_decode(items[3]);
                 if (!passWord.isEmpty()) {
                     url.setPassword(passWord, QUrl::DecodedMode);
+                const auto baseDn = urlpart_decode(items[4]);
+                if (!baseDn.isEmpty()) {
+                    url.setQuery(baseDn, QUrl::DecodedMode);
                 }
-                url.setQuery(urlpart_decode(items[4]), QUrl::DecodedMode);
                 if (items.size() >= 6) {
                     const auto flags = urlpart_decode(items[5]);
                     if (!flags.isEmpty()) {