[Pkg-gnupg-commit] [gnupg2] 136/185: dirmngr: More minor fix.

[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 ade4b2744c848e07b87afa4f186256c2a2ef1d13
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jul 24 16:09:11 2017 +0900

    dirmngr: More minor fix.
    
    * dirmngr/http.c (send_request): Care the case of !USE_TLS.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 dirmngr/http.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dirmngr/http.c b/dirmngr/http.c
index b16de7d..63ed5d3 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -1672,7 +1672,9 @@ send_request (http_t hd, const char *httphost, const char *auth,
   char *proxy_authstr = NULL;
   char *authstr = NULL;
   assuan_fd_t sock;
+#ifdef USE_TLS
   int have_http_proxy = 0;
+#endif
 
   if (hd->uri->use_tls && !hd->session)
     {
@@ -1759,8 +1761,10 @@ send_request (http_t hd, const char *httphost, const char *auth,
 
       if (err)
         ;
+#ifdef USE_TLS
       else if (!strcmp (uri->scheme, "http"))
         have_http_proxy = 1;
+#endif
       else if (!strcmp (uri->scheme, "socks4")
                || !strcmp (uri->scheme, "socks5h"))
         err = gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);

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