diff options
| author | NIIBE Yutaka <[email protected]> | 2015-09-10 01:00:03 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-09-10 01:00:03 +0000 |
| commit | d4a2a070b4b4d30a6bbdd4248421a23cf824d8c0 (patch) | |
| tree | 748022be2fa071b1e0d130a6329214b4a672c83c | |
| parent | po: Update Dutch translation (diff) | |
| download | gnupg-d4a2a070b4b4d30a6bbdd4248421a23cf824d8c0.tar.gz gnupg-d4a2a070b4b4d30a6bbdd4248421a23cf824d8c0.zip | |
gpgconf: Fix scdaemon reload.
* tools/gpgconf-comp.c (scdaemon_runtime_change): Add "scd bye".
--
In GnuPG 2.0.x, it doesn't require newer libassuan which has
ASSUAN_FORCE_CLOSE feature. We need to send "scd bye" to let
the control finish from command loop.
| -rw-r--r-- | tools/gpgconf-comp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 2454f9326..69d160eaf 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -1064,7 +1064,7 @@ scdaemon_runtime_change (void) { gpg_error_t err; const char *pgmname; - const char *argv[6]; + const char *argv[7]; pid_t pid; /* We use "GETINFO app_running" to see whether the agent is already @@ -1077,8 +1077,9 @@ scdaemon_runtime_change (void) argv[1] = "GETINFO scd_running"; argv[2] = "/if ${! $?}"; argv[3] = "scd killscd"; - argv[4] = "/end"; - argv[5] = NULL; + argv[4] = "scd bye"; + argv[5] = "/end"; + argv[6] = NULL; err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); if (!err) |