diff options
| author | Werner Koch <[email protected]> | 2017-01-03 11:03:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-01-03 11:43:33 +0000 |
| commit | 969512401603639e4467ede7d892f1b02582c2c9 (patch) | |
| tree | 0e720221d906ac82ade2dbc0831f5f9b9d0aa27a /dirmngr/server.c | |
| parent | dirmngr: New debug message on correctly initialized libdns. (diff) | |
| download | gnupg-969512401603639e4467ede7d892f1b02582c2c9.tar.gz gnupg-969512401603639e4467ede7d892f1b02582c2c9.zip | |
dirmngr: Make sure Tor mode is also set for DNS on SIGHUP.
* dirmngr/dns-stuff.c (enable_dns_tormode): Always succeed.
(reload_dns_stuff): Reset tor port.
* dirmngr/dirmngr.c (set_tor_mode): Also enable Tor mode for DNS.
(main): Remove warning that Tor mode may not fully work.
* dirmngr/server.c (cmd_dns_cert): Remove explicit Tor for DNS
initialization.
* dirmngr/t-dns-stuff.c (main): Remove option --new-circuit and error
checking for enable_dns_tormode.
--
This patch also resets the port on SIGHUP so that after starting Tor
SIGHUP is sufficient to use Tor. Without the SIGHUP and when not
using the Tor browser Dirmngr would keep on trying the Tor browser
port.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/server.c')
| -rw-r--r-- | dirmngr/server.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c index a785238dc..28c2cd428 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -709,13 +709,6 @@ cmd_dns_cert (assuan_context_t ctx, char *line) } } - if (opt.use_tor && (err = enable_dns_tormode (0))) - { - /* Tor mode is requested but the DNS code can't enable it. */ - assuan_set_error (ctx, err, "error enabling Tor mode"); - goto leave; - } - if (pka_mode || dane_mode) { char *domain; /* Points to mbox. */ |