summaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2017-02-03 12:04:52 +0100
committerWerner Koch <wk@gnupg.org>2017-02-03 12:05:16 +0100
commit7052a0d77cf8f3a445b252a809d29be445788625 (patch)
tree7bc9e2f54b13fe3d7da92ce53b05e7090b609882 /agent
parentgpg: Don't assume that strtoul interprets "" as 0. (diff)
downloadgnupg2-7052a0d77cf8f3a445b252a809d29be445788625.tar.xz
gnupg2-7052a0d77cf8f3a445b252a809d29be445788625.zip
gpg: More diagnostics for a launched pinentry.
* agent/call-pinentry.c (start_pinentry): Call getinfo/ttyinfo. * g10/server.c (gpg_proxy_pinentry_notify): Simplify the output so that we do not change the code when adding new fields to PINENTRY_LAUNCHED. -- This patch changes the --verbose output of gpg to show for example gpg: pinentry launched (5228 gtk2 1.0.1-beta10 \ /dev/pts/4 xterm localhost:10.0) the used tty, its type, and the value of DISPLAY in addiion to the pid, flavor, and version. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'agent')
-rw-r--r--agent/call-pinentry.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index fa00bf921..2bebee205 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -541,7 +541,7 @@ start_pinentry (ctrl_t ctrl)
}
- /* Ask the pinentry for its version and flavor and streo that as a
+ /* Ask the pinentry for its version and flavor and store that as a
* string in MB. This information is useful for helping users to
* figure out Pinentry problems. */
{
@@ -555,6 +555,10 @@ start_pinentry (ctrl_t ctrl)
if (assuan_transact (entry_ctx, "GETINFO version",
put_membuf_cb, &mb, NULL, NULL, NULL, NULL))
put_membuf_str (&mb, "unknown");
+ put_membuf_str (&mb, " ");
+ if (assuan_transact (entry_ctx, "GETINFO ttyinfo",
+ put_membuf_cb, &mb, NULL, NULL, NULL, NULL))
+ put_membuf_str (&mb, "? ? ?");
put_membuf (&mb, "", 1);
flavor_version = get_membuf (&mb, NULL);
}