[git] GnuPG - branch, master, updated. gnupg-2.1.11-136-g6272f24

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  6272f24312f2efe8707a7712858c85cd5a42e6fa (commit)
      from  a0642856b25622c81d3464979c47ff2a30af58fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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.

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

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/ks-engine-http.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org