aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/server.c
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-12-08 11:51:52 +0000
committerWerner Koch <[email protected]>2016-12-14 14:52:01 +0000
commit2e734a3ce159de8fb60df2bd5d454f98ca710717 (patch)
treed154f1df5f50de0d6f836f74d9644771fa6268a8 /dirmngr/server.c
parentdirmngr: Improve ntbtls support. (diff)
downloadgnupg-2e734a3ce159de8fb60df2bd5d454f98ca710717.tar.gz
gnupg-2e734a3ce159de8fb60df2bd5d454f98ca710717.zip
dirmngr,build: Remove support for ADNS.
* autogen.rc: Remove '--with-adns' argument. * configure.ac: Remove check for ADNS. * dirmngr/dns-stuff.c: Remove all code that uses ADNS. * dirmngr/server.c (cmd_getinfo): Update status line. * doc/dirmngr.texi: Do not mention ADNS. -- We used ADNS to support queries over Tor. However, our patch to ADNS that adds Tor support was never accepted upstream. Furthermore, there are other shortcomings that let us to consider alternatives. Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'dirmngr/server.c')
-rw-r--r--dirmngr/server.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c
index f1d762d4f..3e66868e7 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2314,13 +2314,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
(ctx, "- Forced use of System resolver (w/o Tor support)");
else
{
-#if USE_ADNS && HAVE_ADNS_IF_TORMODE
- assuan_set_okay_line (ctx, "- ADNS with Tor support");
-#elif USE_ADNS
- assuan_set_okay_line (ctx, "- ADNS w/o Tor support");
-#else
assuan_set_okay_line (ctx, "- System resolver (w/o Tor support)");
-#endif
}
err = 0;
}