[Pkg-gnupg-commit] [gnupg2] 136/205: dirmngr: Fix https never reported in general help

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 6272f24312f2efe8707a7712858c85cd5a42e6fa
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Apr 15 17:50:07 2016 +0200

    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.
---
 dirmngr/ks-engine-http.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dirmngr/ks-engine-http.c b/dirmngr/ks-engine-http.c
index 882777e..8232313 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git