summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-01-04 17:19:06 +0100
committerWerner Koch <wk@gnupg.org>2015-01-04 17:19:06 +0100
commitac2cb47fc5c0be539aaa07fd141acdbc0934800f (patch)
tree6d388c1f859b5c8e8724b970f1b880c75cd0c22d /tools
parenttools: Free variable before return (diff)
downloadgnupg2-ac2cb47fc5c0be539aaa07fd141acdbc0934800f.tar.xz
gnupg2-ac2cb47fc5c0be539aaa07fd141acdbc0934800f.zip
agent: Make --allow-loopback-pinentry gpgconf changeable.
Diffstat (limited to 'tools')
-rw-r--r--tools/gpgconf-comp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 61faa1d14..86e67eb28 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -542,6 +542,9 @@ static gc_option_t gc_options_gpg_agent[] =
{ "no-allow-mark-trusted", GC_OPT_FLAG_RUNTIME,
GC_LEVEL_ADVANCED, "gnupg", "disallow clients to mark keys as \"trusted\"",
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
+ { "allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME,
+ GC_LEVEL_EXPERT, "gnupg", "allow caller to override the pinentry",
+ GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
{ "no-grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
"gnupg", "do not grab keyboard and mouse",
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },