diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/call-scd.c | 9 | ||||
| -rw-r--r-- | agent/command.c | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/agent/call-scd.c b/agent/call-scd.c index 3f535db6d..deff2949a 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -45,15 +45,6 @@ #define MAX_OPEN_FDS 20 #endif -/* This Assuan flag is only available since libassuan 2.0.2. Because - comments lines are comments anyway we can use a replacement which - might not do anything. assuan_{g,s}et_flag don't return an error - thus there won't be any ABI problem. */ -#ifndef ASSUAN_CONVEY_COMMENTS -#define ASSUAN_CONVEY_COMMENTS 4 -#endif - - /* Definition of module local data of the CTRL structure. */ struct scd_local_s { diff --git a/agent/command.c b/agent/command.c index c33c0d61f..ad86a3575 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2310,12 +2310,8 @@ cmd_killagent (assuan_context_t ctx, char *line) return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket"); ctrl->server_local->stopme = 1; -#ifdef ASSUAN_FORCE_CLOSE assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1); return 0; -#else - return gpg_error (GPG_ERR_EOF); -#endif } |