diff options
| author | Ingo Klöcker <[email protected]> | 2021-08-12 08:47:34 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2021-08-12 08:50:33 +0000 |
| commit | 99601778f4a9dc1c9fee792361c959f5e0732cfd (patch) | |
| tree | 84363a4e4389b824fd04d9ce817b92fc79dbd2c7 /agent/gpg-agent.c | |
| parent | w32: Move socketdir to LCOAL_APPDATA (diff) | |
| download | gnupg-99601778f4a9dc1c9fee792361c959f5e0732cfd.tar.gz gnupg-99601778f4a9dc1c9fee792361c959f5e0732cfd.zip | |
agent: Make --pinentry-formatted-passphrase a simple flag
* agent/agent.h (opt): Change type of pinentry_formatted_passphrase
to int (as for other flags).
* agent/call-pinentry.c (setup_formatted_passphrase): Remove no longer
needed translated strings. Write option without value to Assuan
connection.
* agent/gpg-agent.c (opts): Use ARGPARSE_s_n for
oPinentryFormattedPassphrase.
(parse_rereadable_options): Set option to 1.
--
GnuPG-bug-id: 5553, 5517
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index edc21f4d9..30d7cebaa 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -285,7 +285,7 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_s (oPinentryInvisibleChar, "pinentry-invisible-char", "@"), ARGPARSE_s_u (oPinentryTimeout, "pinentry-timeout", N_("|N|set the Pinentry timeout to N seconds")), - ARGPARSE_s_u (oPinentryFormattedPassphrase, "pinentry-formatted-passphrase", + ARGPARSE_s_n (oPinentryFormattedPassphrase, "pinentry-formatted-passphrase", "@"), ARGPARSE_s_n (oAllowEmacsPinentry, "allow-emacs-pinentry", N_("allow passphrase to be prompted through Emacs")), @@ -914,7 +914,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread) break; case oPinentryTimeout: opt.pinentry_timeout = pargs->r.ret_ulong; break; case oPinentryFormattedPassphrase: - opt.pinentry_formatted_passphrase = pargs->r.ret_ulong; + opt.pinentry_formatted_passphrase = 1; break; case oTpm2daemonProgram: |