diff options
author | Werner Koch <[email protected]> | 2015-12-02 17:47:50 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2015-12-02 17:57:49 +0000 |
commit | 69db3285e4612ad24462149a4d64cc32c090a491 (patch) | |
tree | e19035a1f90ddd2a18a7bf2c28ac34dd33fe0622 /dirmngr/dirmngr.c | |
parent | gpg: Improve documentation. (diff) | |
download | gnupg-69db3285e4612ad24462149a4d64cc32c090a491.tar.gz gnupg-69db3285e4612ad24462149a4d64cc32c090a491.zip |
build: Require at least Libassuan 2.4.1.
* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
* agent/gpg-agent.c (create_server_socket): Remove check for
libassuan >= 2.3.0 and >= 2.1.4.
(main): Remove check for libassuan >= 2.1.4.
* scd/scdaemon.c (create_server_socket): Remove check for
libassuan >= 2.1.4.
* dirmngr/dirmngr.c (set_tor_mode): Remove check for
libassuan >= 2.3.0.
* dirmngr/http.c (http_raw_connect, send_request): Remove checks for
libassuan >= 2.3.0.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/dirmngr.c')
-rw-r--r-- | dirmngr/dirmngr.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 97d2e15e6..f249d683f 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -473,9 +473,7 @@ 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"); @@ -1135,7 +1133,6 @@ main (int argc, char **argv) dirmngr_exit (1); } -#if ASSUAN_VERSION_NUMBER >= 0x020104 /* >= 2.1.4 */ { int redirected; @@ -1159,16 +1156,6 @@ main (int argc, char **argv) socket_name, redir_socket_name); } } -#else /* Assuan < 2.1.4 */ - memset (&serv_addr, 0, sizeof serv_addr); - serv_addr.sun_family = AF_UNIX; - if (strlen (socket_name)+1 >= sizeof serv_addr.sun_path ) - { - log_error (_("socket name '%s' is too long\n"), socket_name); - dirmngr_exit (1); - } - strcpy (serv_addr.sun_path, socket_name); -#endif /* Assuan < 2.1.4 */ len = SUN_LEN (&serv_addr); |