diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 5 | ||||
| -rw-r--r-- | scd/command.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 4f2d2f258..45c9c7c0c 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,8 @@ +2011-08-10 Werner Koch <[email protected]> + + * command.c (cmd_killscd): Use the new assuan force close flag + if available. + 2011-08-08 Werner Koch <[email protected]> * app-openpgp.c (do_decipher): Take care of accidentally passed diff --git a/scd/command.c b/scd/command.c index a579b24eb..9bb500523 100644 --- a/scd/command.c +++ b/scd/command.c @@ -1862,7 +1862,15 @@ cmd_killscd (assuan_context_t ctx, char *line) (void)line; ctrl->server_local->stopme = 1; +#ifdef ASSUAN_FORCE_CLOSE + assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1); + return 0; +#else + /* Actually returning an EOF does not anymore work with modern + Libassuan versions. However we keep that non working code until + we make a Libassuan with the force close flag a requirement. */ return gpg_error (GPG_ERR_EOF); +#endif } |