From 3e05f99e8db5c4039d352d5bd9dde01ed9653f2f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 26 May 2021 19:06:10 +0200 Subject: dirmngr: Use --ldaptimeout for OpenPGP LDAP keyservers. * dirmngr/ks-engine-ldap.c (my_ldap_connect): Use LDAP_OPT_TIMEOUT. * dirmngr/dirmngr.c (main): Move --ldaptimeout setting to ... (parse_rereadable_options): here. -- Note that this has not yet been tested. In fact a test with OpenLDAP using a modified route got stuck in the connection attempt. Maybe it works on Windows - will be tested later. Signed-off-by: Werner Koch (cherry picked from commit 317d5947b84ae2707e46b89fb0d8318c07174e13) --- dirmngr/dirmngr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'dirmngr/dirmngr.c') diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index ebb6ae08a..915e0e601 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -679,6 +679,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread) set_dns_timeout (0); opt.connect_timeout = 0; opt.connect_quick_timeout = 0; + opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT; ldapserver_list_needs_reset = 1; return 1; } @@ -813,6 +814,10 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread) opt.connect_quick_timeout = pargs->r.ret_ulong * 1000; break; + case oLDAPTimeout: + opt.ldaptimeout = pargs->r.ret_int; + break; + default: return 0; /* Not handled. */ } @@ -1068,9 +1073,6 @@ main (int argc, char **argv) # endif /*USE_LDAP*/ break; case oLDAPAddServers: opt.add_new_ldapservers = 1; break; - case oLDAPTimeout: - opt.ldaptimeout = pargs.r.ret_int; - break; case oFakedSystemTime: gnupg_set_time ((time_t)pargs.r.ret_ulong, 0); -- cgit v1.2.3