[git] GnuPG - branch, master, updated. gnupg-2.1.11-135-ga064285

[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  a0642856b25622c81d3464979c47ff2a30af58fa (commit)
      from  d1507b4f95eb7bb2478f7549510ddcb114e6f285 (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 a0642856b25622c81d3464979c47ff2a30af58fa
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Apr 15 17:19:40 2016 +0200

    dirmngr: Fix https incorrectly reported in help
    
    * dirmngr/ks-engine-http.c (ks_hkp_help): Only print https if tls
    is supported.
    
    --
    Wrong reporting was pointed out by K_F. Check is the same as
    in ks-engine-hkp.c

diff --git a/dirmngr/ks-engine-http.c b/dirmngr/ks-engine-http.c
index c51c0ce..882777e 100644
--- a/dirmngr/ks-engine-http.c
+++ b/dirmngr/ks-engine-http.c
@@ -38,7 +38,9 @@ ks_http_help (ctrl_t ctrl, parsed_uri_t uri)
   const char const data[] =
     "Handler for HTTP URLs:\n"
     "  http://\n"
+#if  HTTP_USE_GNUTLS || HTTP_USE_NTBTLS
     "  https://\n"
+#endif
     "Supported methods: fetch\n";
   gpg_error_t err;
 

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

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


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