diff options
| author | Werner Koch <wk@gnupg.org> | 2017-08-04 18:34:03 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-08-04 18:34:03 +0200 |
| commit | 3d78ae4d3de08398fabae5821045a3a1da6dadbe (patch) | |
| tree | 2a2cafa53ce20f533db5d076f43d80f11c00f9b2 /doc | |
| parent | gpg: Avoid double fingerprint printing with import-show. (diff) | |
| download | gnupg2-3d78ae4d3de08398fabae5821045a3a1da6dadbe.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gpg-agent.texi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index d61dc85ae..d7a562af1 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -325,10 +325,14 @@ the environment variable @code{SHELL} which is correct in almost all cases. -@item --no-grab +@item --grab +@itemx --no-grab +@opindex grab @opindex no-grab -Tell the pinentry not to grab the keyboard and mouse. This option -should in general not be used to avoid X-sniffing attacks. +Tell the pinentry to grab the keyboard and mouse. This option should +be used on X-Servers to avoid X-sniffing attacks. Any use of the +option @option{--grab} overrides an used option @option{--no-grab}. +The default is @option{--no-grab}. @anchor{option --log-file} @item --log-file @var{file} |