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/agent.h | |
| 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/agent.h')
| -rw-r--r-- | agent/agent.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/agent/agent.h b/agent/agent.h index fb2adde79..23982626d 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -108,13 +108,8 @@ struct upon this timeout value. */ unsigned long pinentry_timeout; - /* Mode for the formatted passphrase option to use by pinentry. - Possible values are: - 0 - Option is not shown (and off). - 1 - Option is shown, off by default, and user can change it. - 2 - Option is shown, on, and user cannot change it. - 3 - Option is shown, on by default, and user can change it. */ - unsigned int pinentry_formatted_passphrase; + /* If set, then passphrase formatting is enabled in pinentry. */ + int pinentry_formatted_passphrase; /* The default and maximum TTL of cache entries. */ unsigned long def_cache_ttl; /* Default. */ |