diff options
| author | Werner Koch <[email protected]> | 2015-11-12 12:20:18 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-11-12 12:20:18 +0000 |
| commit | a2cc1d57552ccac7b2f9a0c6423b171b2a168b2a (patch) | |
| tree | 75f2bf1163992aae261973fdd801074ff7c7ccf5 /dirmngr/dirmngr.c | |
| parent | gpg: Fix cache consistency problem. (diff) | |
| download | gnupg-a2cc1d57552ccac7b2f9a0c6423b171b2a168b2a.tar.gz gnupg-a2cc1d57552ccac7b2f9a0c6423b171b2a168b2a.zip | |
dirmngr: New option --nameserver.
* dirmngr/dirmngr.c (oNameServer): New.
(opts): Add --nameserver.
(parse_rereadable_options): Act upon oNameServer.
* dirmngr/dns-stuff.c (DEFAULT_NAMESERVER): New.
(tor_nameserver): New.
(set_dns_nameserver): New.
(my_adns_init): Make name server configurable.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/dirmngr.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index d6c1670cd..8789d818e 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -68,6 +68,7 @@ #endif #include "../common/init.h" #include "gc-opt-flags.h" +#include "dns-stuff.h" /* The plain Windows version uses the windows service system. For example to start the service you may use "sc start dirmngr". @@ -142,6 +143,7 @@ enum cmd_and_opt_values { oIgnoreCertExtension, oUseTor, oKeyServer, + oNameServer, aTest }; @@ -214,6 +216,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_i (oMaxReplies, "max-replies", N_("|N|do not return more than N items in one query")), + ARGPARSE_s_s (oNameServer, "nameserver", "@"), ARGPARSE_s_s (oKeyServer, "keyserver", "@"), ARGPARSE_s_s (oHkpCaCert, "hkp-cacert", N_("|FILE|use the CA certificates in FILE for HKP over TLS")), @@ -623,6 +626,10 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) opt.keyserver = *pargs->r.ret_str? xtrystrdup (pargs->r.ret_str) : NULL; break; + case oNameServer: + set_dns_nameserver (pargs->r.ret_str); + break; + default: return 0; /* Not handled. */ } |