From 69db3285e4612ad24462149a4d64cc32c090a491 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 2 Dec 2015 18:47:50 +0100 Subject: 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 --- scd/scdaemon.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'scd/scdaemon.c') diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 0f92efe02..e8218ca9c 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -1082,7 +1082,6 @@ create_server_socket (const char *name, char **r_redir_name, unaddr = xmalloc (sizeof (*unaddr)); addr = (struct sockaddr*)unaddr; -#if ASSUAN_VERSION_NUMBER >= 0x020104 /* >= 2.1.4 */ { int redirected; @@ -1102,16 +1101,6 @@ create_server_socket (const char *name, char **r_redir_name, log_info ("redirecting socket '%s' to '%s'\n", name, *r_redir_name); } } -#else /* Assuan < 2.1.4 */ - memset (unaddr, 0, sizeof *unaddr); - unaddr->sun_family = AF_UNIX; - if (strlen (name) + 1 >= sizeof (unaddr->sun_path)) - { - log_error (_("socket name '%s' is too long\n"), name); - scd_exit (2); - } - strcpy (unaddr->sun_path, name); -#endif /* Assuan < 2.1.4 */ len = SUN_LEN (unaddr); -- cgit v1.2.3