From 438730323a5d9bbf8dd5cd60d479b6c03f8721d0 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 5 Oct 2015 11:31:31 +0200
Subject: [PATCH] dirmngr: Make clear that --use-tor is not yet ready for use.

* dirmngr/dirmngr.c (main): Print a warning if --use-tor has been
given.
* tools/gpgconf-comp.c (gc_options_dirmngr): Make --use-tor invisible.
---
 dirmngr/dirmngr.c    | 8 ++++++++
 doc/dirmngr.texi     | 6 ++++++
 tools/gpgconf-comp.c | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index fb9a70135..31833ebd6 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -960,6 +960,14 @@ main (int argc, char **argv)
   log_info ("NOTE: this is a development version!\n");
 #endif
 
+  if (opt.use_tor)
+    {
+      log_info ("WARNING: ***************************************\n");
+      log_info ("WARNING: TOR mode (--use-tor) DOES NOT YET WORK!\n");
+      log_info ("WARNING: ***************************************\n");
+    }
+
+
   /* Print a warning if an argument looks like an option.  */
   if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
     {
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index d62e2d59c..7757acf10 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -236,6 +236,12 @@ sufficient.
 Enabling this option forces loading of expired CRLs; this is only
 useful for debugging.
 
+@item --use-tor
+@opindex use-tor
+This options is not yet functional!  It will eventually switch GnuPG
+into a TOR mode to route all network access via TOR (an anonymity
+network).
+
 @item --disable-ldap
 @opindex disable-ldap
 Entirely disables the use of LDAP.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index cf53ebc61..464b89b78 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -911,7 +911,7 @@ static gc_option_t gc_options_dirmngr[] =
    { "TOR",
      GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
      "gnupg", N_("Options controlling the use of TOR") },
-   { "use-tor", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
+   { "use-tor", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
      "dirmngr", "route all network traffic via TOR",
       GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },