diff options
| author | Werner Koch <[email protected]> | 2017-08-04 16:34:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-08-04 16:34:03 +0000 |
| commit | 3d78ae4d3de08398fabae5821045a3a1da6dadbe (patch) | |
| tree | 2a2cafa53ce20f533db5d076f43d80f11c00f9b2 /tools/gpgconf-comp.c | |
| parent | gpg: Avoid double fingerprint printing with import-show. (diff) | |
| download | gnupg-3d78ae4d3de08398fabae5821045a3a1da6dadbe.tar.gz gnupg-3d78ae4d3de08398fabae5821045a3a1da6dadbe.zip | |
agent: Make --no-grab the default.
* agent/gpg-agent.c (oGrab): New const.
(opts): New option --grab. Remove description for --no-grab.
(parse_rereadable_options): Make --no-grab the default.
(finalize_rereadable_options): Allow --grab to override --no-grab.
(main) <gpgconflist>: Add "grab".
* tools/gpgconf-comp.c (gc_options_gpg_agent): Add "grab".
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | tools/gpgconf-comp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index cfc9fa3b7..527815ccb 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -550,6 +550,9 @@ static gc_option_t gc_options_gpg_agent[] = GC_LEVEL_ADVANCED, "gnupg", "allow passphrase to be prompted through Emacs", GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, + { "grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT, + "gnupg", NULL, + GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, { "no-allow-external-cache", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC, "gnupg", "disallow the use of an external password cache", GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, @@ -559,9 +562,6 @@ static gc_option_t gc_options_gpg_agent[] = { "no-allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT, "gnupg", "disallow 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 }, { "Passphrase policy", GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, |