diff options
| author | Werner Koch <[email protected]> | 2022-08-22 10:01:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-08-22 10:05:02 +0000 |
| commit | 203dcc19eb48228c60036691fe87fb37e29369a4 (patch) | |
| tree | 03944832ea477df71ad14ed535926355d2e0b43a /sm/gpgsm.c | |
| parent | dirmngr: Fix NTBTLS include for test (diff) | |
| download | gnupg-203dcc19eb48228c60036691fe87fb37e29369a4.tar.gz gnupg-203dcc19eb48228c60036691fe87fb37e29369a4.zip | |
common: New common option no-autostart.
* common/comopt.c (opts): Add "no-autostart".
(parse_comopt): Set it.
* common/comopt.h (comopt): Add no_autostart.
* g10/gpg.c (main): Take care of the new option.
* sm/gpgsm.c (main): Ditto.
* tools/gpg-connect-agent.c (INCLUDED_BY_MAIN_MODULE): Add.
(main): Parse common options and handle new option.
* tools/gpg-card.c (main): Ditto.
(cmd_yubikey): Fix minor error reporting issue.
* common/util.h (GNUPG_MODULE_NAME_CARD): New const.
* common/homedir.c (gnupg_module_name): Support it.
--
Having a global option makes it easier to use disable autostart on a
server which is required to use a remote gpg-agent reliable.
Diffstat (limited to 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 4c7c28c3e..bc22d68b3 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1534,6 +1534,9 @@ main ( int argc, char **argv) comopt.keyboxd_program = NULL; } + if (comopt.no_autostart) + opt.autostart = 0; + if (pwfd != -1) /* Read the passphrase now. */ read_passphrase_from_fd (pwfd); |