summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2017-07-24 09:09:11 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2017-07-24 09:09:11 +0200
commitade4b2744c848e07b87afa4f186256c2a2ef1d13 (patch)
tree3ccb2f5218fe69af67f4c91362b9b793ce9e29dd
parentdirmngr: More minor fixes. (diff)
downloadgnupg2-ade4b2744c848e07b87afa4f186256c2a2ef1d13.tar.xz
gnupg2-ade4b2744c848e07b87afa4f186256c2a2ef1d13.zip
dirmngr: More minor fix.
* dirmngr/http.c (send_request): Care the case of !USE_TLS. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-rw-r--r--dirmngr/http.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/dirmngr/http.c b/dirmngr/http.c
index b16de7d6f..63ed5d34c 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);