diff options
| author | Werner Koch <wk@gnupg.org> | 2011-12-20 11:12:21 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-12-20 11:12:21 +0100 |
| commit | 366512abe44d9e71bb2c699c29477afa6ac71cdd (patch) | |
| tree | 5712a4ea7f0b0b24acdd8844d65fb429d04eef35 /scd | |
| parent | Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify. (diff) | |
| download | gnupg2-366512abe44d9e71bb2c699c29477afa6ac71cdd.tar.xz gnupg2-366512abe44d9e71bb2c699c29477afa6ac71cdd.zip | |
Require Libassuan 2.0.3
* configure.ac: Require Libassuan 2.0.3.
* agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
* agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
dependency.
(cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
* scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/command.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scd/command.c b/scd/command.c index afd5ef231..88f8ec2c9 100644 --- a/scd/command.c +++ b/scd/command.c @@ -1936,15 +1936,8 @@ 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 } |