diff options
| author | Werner Koch <[email protected]> | 2016-12-20 08:53:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-12-20 08:53:58 +0000 |
| commit | 81c012787fabf734d9c952c6f18ecac21929d4d8 (patch) | |
| tree | a69f7064a65d66c5f623eb11d272f173e4f8f08f /tools/gpgconf-comp.c | |
| parent | dirmngr: Fix problems with the getsrv function. (diff) | |
| download | gnupg-81c012787fabf734d9c952c6f18ecac21929d4d8.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | tools/gpgconf-comp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index e45857dab..925f1cf2d 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -889,6 +889,12 @@ static gc_option_t gc_options_dirmngr[] = { "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT, "dirmngr", "|FILE|read options from FILE", GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR }, + { "resolver-timeout", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, + NULL, NULL, + GC_ARG_TYPE_INT32, GC_BACKEND_DIRMNGR }, + { "nameserver", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, + NULL, NULL, + GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR }, { "Debug", GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, |