summaryrefslogtreecommitdiffstats
path: root/doc/dirmngr.texi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-12-20 09:53:58 +0100
committerWerner Koch <wk@gnupg.org>2016-12-20 09:53:58 +0100
commit81c012787fabf734d9c952c6f18ecac21929d4d8 (patch)
treea69f7064a65d66c5f623eb11d272f173e4f8f08f /doc/dirmngr.texi
parentdirmngr: Fix problems with the getsrv function. (diff)
downloadgnupg2-81c012787fabf734d9c952c6f18ecac21929d4d8.tar.xz
gnupg2-81c012787fabf734d9c952c6f18ecac21929d4d8.zip
dirmngr: New option --resolver-timeout.
* dirmngr/dns-stuff.c (DEFAULT_TIMEOUT): New. (opt_timeout): New var. (set_dns_timeout): New. (libdns_res_open): Set the default timeout. (libdns_res_wait): Use configurable timeout. (resolve_name_libdns): Ditto. * dirmngr/dirmngr.c (oResolverTimeout): New const. (opts): New option --resolver-timeout. (parse_rereadable_options): Set that option. (main) <aGPGConfList>: Add --nameserver and --resolver-timeout. * tools/gpgconf-comp.c (gc_options_dirmngr): Add --resolver-timeout and --nameserver. * dirmngr/http.c (connect_server): Fix yesterday introduced bug in error diagnostic. -- This timeout is a pretty crude thing because libdns has a few other internal timeouts as well. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'doc/dirmngr.texi')
-rw-r--r--doc/dirmngr.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 94ef35dd1..5b4e68bc8 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -255,6 +255,10 @@ Implemented'' if this function is used.
@opindex recursive-resolver
When possible use a recursive resolver instead of a stub resolver.
+@item --resolver-timeout @var{n}
+Set the timeout for the DNS resolver to N seconds. The default are 30
+seconds.
+
@item --allow-version-check
@opindex allow-version-check
Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get