[Pkg-gnupg-commit] [gnupg2] 184/241: dirmngr: Improve output of "getinfo tor".

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit d226e67856e7197c581dcd2cef0f1e687bee0ac9
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 26 17:35:56 2015 +0100

    dirmngr: Improve output of "getinfo tor".
    
    * dirmngr/server.c (cmd_getinfo): Print a message along with OK.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 dirmngr/server.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dirmngr/server.c b/dirmngr/server.c
index ba37508..8954ba8 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2121,7 +2121,13 @@ cmd_getinfo (assuan_context_t ctx, char *line)
     }
   else if (!strcmp (line, "tor"))
     {
-      err = opt.use_tor? 0:set_error (GPG_ERR_GENERAL, "Tor mode not enabled");
+      if (opt.use_tor)
+        {
+          err = 0;
+          assuan_set_okay_line (ctx, " - Tor mode is enabled");
+        }
+      else
+        err = set_error (GPG_ERR_FALSE, "Tor mode is NOT enabled");
     }
   else
     err = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git