diff options
| author | Werner Koch <[email protected]> | 2019-08-06 12:28:08 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-08-06 12:57:07 +0000 |
| commit | 0611f548bcd3c772084d6c3111dc88a09a67f65a (patch) | |
| tree | d78e418c5a4ecdb6ed504cf9082e78cf266837b5 /common/homedir.c | |
| parent | common: Remove code duplication for service starting. (diff) | |
| download | gnupg-0611f548bcd3c772084d6c3111dc88a09a67f65a.tar.gz gnupg-0611f548bcd3c772084d6c3111dc88a09a67f65a.zip | |
tools: New option --keyboxd for gpg-connect-agent.
* configure.ac: New option --keyboxd-pgm.
(KEYBOXD_NAME, KEYBOXD_DISP_NAME): New ac_defines.
* common/util.h: Add substitutes for new error codes.
(GNUPG_MODULE_NAME_KEYBOXD): New.
* common/homedir.c (gnupg_module_name): Support
GNUPG_MODULE_NAME_KEYBOXD.
* common/asshelp.c (SECS_TO_WAIT_FOR_KEYBOXD): New.
(wait_for_sock): Support keyboxd.
(start_new_service): Ditto.
(start_new_keyboxd): New.
* tools/gpg-connect-agent.c: New options --keyboxd and
--keyboxd-program.
(start_agent): Implement new option.
--
This change allows us to test the new keyboxd using our standard
helper. It also provides the necessary code to start keyboxd on the
fly.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/homedir.c')
| -rw-r--r-- | common/homedir.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/common/homedir.c b/common/homedir.c index 9c680a57f..4425d7811 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -1115,6 +1115,13 @@ gnupg_module_name (int which) X(bindir, "dirmngr", DIRMNGR_NAME); #endif + case GNUPG_MODULE_NAME_KEYBOXD: +#ifdef GNUPG_DEFAULT_KEYBOXD + return GNUPG_DEFAULT_KEYBOXD; +#else + X(bindir, "keyboxd", KEYBOXD_NAME); +#endif + case GNUPG_MODULE_NAME_PROTECT_TOOL: #ifdef GNUPG_DEFAULT_PROTECT_TOOL return GNUPG_DEFAULT_PROTECT_TOOL; |