diff options
| author | Werner Koch <[email protected]> | 2015-10-20 17:03:26 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-10-20 17:03:26 +0000 |
| commit | 58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9 (patch) | |
| tree | 0d51f1bbc2762349f7094b7128e5eb74822077c4 /dirmngr/server.c | |
| parent | w32: Allow building again. (diff) | |
| download | gnupg-58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9.tar.gz gnupg-58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9.zip | |
dirmngr: Prefer ADNS over system resolver.
* configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
(USE_DNS_CERT): Prefer ADNS over the system resolver.
* dirmngr/dns-cert.c (tor_mode): New global var.
(enable_dns_tormode): New func.
(get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
* dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c index bfcdd5759..f6225d438 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -713,8 +713,9 @@ cmd_dns_cert (assuan_context_t ctx, char *line) } } - if (opt.use_tor) + if (opt.use_tor && enable_dns_tormode ()) { + /* TOR mode is requested but the DNS code can't enable it. */ err = gpg_error (GPG_ERR_FORBIDDEN); goto leave; } |