[git] GnuPG - branch, master, updated. gnupg-2.1.18-106-ge174893

[by Werner Koch]

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  e174893262d8de0f52faa8abe4fc0402719a35d8 (commit)
      from  81ea24b8637ac08e44e9e44816689413c2ae7e08 (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 e174893262d8de0f52faa8abe4fc0402719a35d8
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Feb 20 10:02:25 2017 +0100

    dirmngr.c: Make http.c build without any TLS support.
    
    * dirmngr/http.c (http_session_new): Remove used of tls_prority.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/http.c b/dirmngr/http.c
index e7c6d42..cb90540 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -767,11 +767,12 @@ http_session_new (http_session_t *r_session,
         goto leave;
       }
   }
-#else /*!HTTP_USE_GNUTLS*/
+#else /*!HTTP_USE_GNUTLS && !HTTP_USE_NTBTLS*/
   {
-    (void)tls_priority;
+    (void)intended_hostname;
+    (void)flags;
   }
-#endif /*!HTTP_USE_GNUTLS*/
+#endif /*!HTTP_USE_GNUTLS && !HTTP_USE_NTBTLS*/
 
   if (opt_debug > 1)
     log_debug ("http.c:session_new: sess %p created\n", sess);

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

Summary of changes:
 dirmngr/http.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


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