diff options
| author | Werner Koch <[email protected]> | 2015-10-19 18:30:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-10-19 18:52:19 +0000 |
| commit | 4e42ad300b3de9fab25095a9e82431b1ea2740e7 (patch) | |
| tree | 7fe565aec714c8ad812d886f19211350fe5373af | |
| parent | gpg: Fix --desig-revoke. (diff) | |
| download | gnupg-4e42ad300b3de9fab25095a9e82431b1ea2740e7.tar.gz gnupg-4e42ad300b3de9fab25095a9e82431b1ea2740e7.zip | |
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.
| -rw-r--r-- | dirmngr/dirmngr.c | 2 | ||||
| -rw-r--r-- | dirmngr/http.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 744fb52b0..9aa1ca3d9 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 6f8bf3da0..ab32bd812 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); |