diff options
Diffstat (limited to '')
| -rw-r--r-- | agent/gpg-agent.c | 4 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 918c72b62..fe310f490 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -205,7 +205,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oAllowPresetPassphrase, "allow-preset-passphrase", /* */ N_("allow presetting passphrase")), ARGPARSE_s_n (oAllowLoopbackPinentry, "allow-loopback-pinentry", - N_("allow presetting passphrase")), + N_("allow caller to override the pinentry")), ARGPARSE_s_n (oSSHSupport, "enable-ssh-support", N_("enable ssh support")), ARGPARSE_s_n (oPuttySupport, "enable-putty-support", #ifdef HAVE_W32_SYSTEM @@ -1060,6 +1060,8 @@ main (int argc, char **argv ) #else es_printf ("enable-ssh-support:%lu:\n", GC_OPT_FLAG_NONE); #endif + es_printf ("allow-loopback-pinentry:%lu:\n", + GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME); agent_exit (0); } 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 }, |