From 3d78ae4d3de08398fabae5821045a3a1da6dadbe Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 4 Aug 2017 18:34:03 +0200 Subject: 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) : Add "grab". * tools/gpgconf-comp.c (gc_options_gpg_agent): Add "grab". Signed-off-by: Werner Koch --- doc/gpg-agent.texi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'doc') 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} -- cgit v1.2.3