aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2016-04-15 15:50:07 +0000
committerAndre Heinecke <[email protected]>2016-04-15 15:50:07 +0000
commit6272f24312f2efe8707a7712858c85cd5a42e6fa (patch)
treec8663734cb2e24df90decfa232cef2c3a42c95b7
parentdirmngr: Fix https incorrectly reported in help (diff)
downloadgnupg-6272f24312f2efe8707a7712858c85cd5a42e6fa.tar.gz
gnupg-6272f24312f2efe8707a7712858c85cd5a42e6fa.zip
dirmngr: Fix https never reported in general help
* dirmngr/ks-engine-http.c (ks_hkp_help): Also print https when supported and no uri provided. -- Wrong reporting was pointed out by K_F, again.
-rw-r--r--dirmngr/ks-engine-http.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/dirmngr/ks-engine-http.c b/dirmngr/ks-engine-http.c
index 882777e01..8232313a3 100644
--- a/dirmngr/ks-engine-http.c
+++ b/dirmngr/ks-engine-http.c
@@ -44,8 +44,14 @@ ks_http_help (ctrl_t ctrl, parsed_uri_t uri)
"Supported methods: fetch\n";
gpg_error_t err;
+#if HTTP_USE_GNUTLS || HTTP_USE_NTBTLS
+ const char data2[] = " http\n https";
+#else
+ const char data2[] = " http";
+#endif
+
if (!uri)
- err = ks_print_help (ctrl, " http");
+ err = ks_print_help (ctrl, data2);
else if (uri->is_http && strcmp (uri->scheme, "hkp"))
err = ks_print_help (ctrl, data);
else