mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
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.
This commit is contained in:
parent
1dea3746b4
commit
d4a2a070b4
@ -1064,7 +1064,7 @@ scdaemon_runtime_change (void)
|
|||||||
{
|
{
|
||||||
gpg_error_t err;
|
gpg_error_t err;
|
||||||
const char *pgmname;
|
const char *pgmname;
|
||||||
const char *argv[6];
|
const char *argv[7];
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
|
|
||||||
/* We use "GETINFO app_running" to see whether the agent is already
|
/* 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[1] = "GETINFO scd_running";
|
||||||
argv[2] = "/if ${! $?}";
|
argv[2] = "/if ${! $?}";
|
||||||
argv[3] = "scd killscd";
|
argv[3] = "scd killscd";
|
||||||
argv[4] = "/end";
|
argv[4] = "scd bye";
|
||||||
argv[5] = NULL;
|
argv[5] = "/end";
|
||||||
|
argv[6] = NULL;
|
||||||
|
|
||||||
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
|
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
|
||||||
if (!err)
|
if (!err)
|
||||||
|
Loading…
Reference in New Issue
Block a user