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 /agent | |
| 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 'agent')
| -rw-r--r-- | agent/gpg-agent.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 603f70739..841e4e323 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -83,6 +83,7 @@ enum cmd_and_opt_values oNoOptions, oHomedir, oNoDetach, + oGrab, oNoGrab, oLogFile, oServer, @@ -169,7 +170,10 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oDebugPinentry, "debug-pinentry", "@"), ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")), - ARGPARSE_s_n (oNoGrab, "no-grab", N_("do not grab keyboard and mouse")), + ARGPARSE_s_n (oGrab, "grab", "@"), + /* FIXME: Add the below string for 2.3 */ + /* N_("let PIN-Entry grab keyboard and mouse")), */ + ARGPARSE_s_n (oNoGrab, "no-grab", "@"), ARGPARSE_s_s (oLogFile, "log-file", N_("use a log file for the server")), ARGPARSE_s_s (oPinentryProgram, "pinentry-program", /* */ N_("|PGM|use PGM as the PIN-Entry program")), @@ -787,7 +791,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) opt.quiet = 0; opt.verbose = 0; opt.debug = 0; - opt.no_grab = 0; + opt.no_grab = 1; opt.debug_pinentry = 0; opt.pinentry_program = NULL; opt.pinentry_touch_file = NULL; @@ -842,7 +846,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) } break; - case oNoGrab: opt.no_grab = 1; break; + case oNoGrab: opt.no_grab |= 1; break; + case oGrab: opt.no_grab |= 2; break; case oPinentryProgram: opt.pinentry_program = pargs->r.ret_str; break; case oPinentryTouchFile: opt.pinentry_touch_file = pargs->r.ret_str; break; @@ -917,6 +922,9 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) static void finalize_rereadable_options (void) { + /* Hack to allow --grab to override --no-grab. */ + if ((opt.no_grab & 2)) + opt.no_grab = 0; } @@ -1406,6 +1414,8 @@ main (int argc, char **argv ) GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME); es_printf ("enable-extended-key-format:%lu:\n", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME); + es_printf ("grab:%lu:\n", + GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME); agent_exit (0); } |