security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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:
NIIBE Yutaka 2015-09-10 10:00:03 +09:00
parent 1dea3746b4
commit d4a2a070b4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/gpgconf-comp.c
View File

@ -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)