[Pkg-gnupg-commit] [gnupg2] 23/241: dirmngr: Allow building with libassuan < 2.3.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 4e42ad300b3de9fab25095a9e82431b1ea2740e7
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 19 20:30:27 2015 +0200

    dirmngr: Allow building with libassuan < 2.3.
    
    * dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
    available.
    * dirmngr/http.c (http_raw_connect): Ditto.
    --
    
    Frankly we should require that but we can also wait for 2.4.0 and
    switch then.
---
 dirmngr/dirmngr.c | 2 ++
 dirmngr/http.c    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 744fb52..9aa1ca3 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -470,7 +470,9 @@ set_tor_mode (void)
 {
   if (opt.use_tor)
     {
+#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
       if (assuan_sock_set_flag (ASSUAN_INVALID_FD, "tor-mode", 1))
+#endif
         {
           log_error ("error enabling TOR mode: %s\n", strerror (errno));
           log_info ("(is your Libassuan recent enough?)\n");
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 6f8bf3d..ab32bd8 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -753,7 +753,9 @@ http_raw_connect (http_t *r_hd, const char *server, unsigned short port,
     {
       int mode;
 
+#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
       if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
+#endif
         {
           log_error ("TOR support is not available\n");
           return 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