diff options
| author | Werner Koch <wk@gnupg.org> | 2020-09-23 12:02:50 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-09-24 10:37:41 +0200 |
| commit | acaeba2dbdb9bbd68a823c671d5c3577fef5d26d (patch) | |
| tree | 87dddf7490c76a7be71ea840e03a5371f5875a26 /tools/gpgconf.c | |
| parent | scd: Fix CCID internal driver for interrupt transfer. (diff) | |
| download | gnupg2-acaeba2dbdb9bbd68a823c671d5c3577fef5d26d.tar.xz gnupg2-acaeba2dbdb9bbd68a823c671d5c3577fef5d26d.zip | |
keyboxd: Integrate into gpgconf.
* common/asshelp.c (lock_spawning): Use a dedicated name for keyboxd.
* common/homedir.c (keyboxd_socket_name): New.
(gnupg_module_name): Put keyboxd into libexecdir.
* tools/gpgconf-comp.c (known_options_keyboxd): New.
(gc_component): Add entry for keyboxd.
(keyboxd_runtime_change): New.
(gc_component_launch): Support keyboxd.
* tools/gpgconf.c (list_dirs): Emit new item keyboxd-socket.
(main): Also remove keyboxd socket.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'tools/gpgconf.c')
| -rw-r--r-- | tools/gpgconf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/gpgconf.c b/tools/gpgconf.c index 346a6585d..f5f57f577 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -249,6 +249,7 @@ list_dirs (estream_t fp, char **names) { "localedir", gnupg_localedir, NULL }, { "socketdir", gnupg_socketdir, NULL }, { "dirmngr-socket", dirmngr_socket_name, NULL,}, + { "keyboxd-socket", keyboxd_socket_name, NULL,}, { "agent-ssh-socket", gnupg_socketdir, GPG_AGENT_SSH_SOCK_NAME }, { "agent-extra-socket", gnupg_socketdir, GPG_AGENT_EXTRA_SOCK_NAME }, { "agent-browser-socket",gnupg_socketdir, GPG_AGENT_BROWSER_SOCK_NAME }, @@ -732,6 +733,8 @@ main (int argc, char **argv) names[0] = "agent-socket"; else if (idx == GC_COMPONENT_DIRMNGR) names[0] = "dirmngr-socket"; + else if (idx == GC_COMPONENT_KEYBOXD) + names[0] = "keyboxd-socket"; else names[0] = NULL; names[1] = NULL; @@ -891,6 +894,7 @@ main (int argc, char **argv) GPG_AGENT_BROWSER_SOCK_NAME, GPG_AGENT_SSH_SOCK_NAME, SCDAEMON_SOCK_NAME, + KEYBOXD_SOCK_NAME, DIRMNGR_SOCK_NAME }; int i; |