aboutsummaryrefslogtreecommitdiffstats
path: root/agent/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'agent/command.c')
-rw-r--r--agent/command.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/agent/command.c b/agent/command.c
index 0406ea439..aec48e194 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -579,9 +579,10 @@ cmd_get_confirmation (ASSUAN_CONTEXT ctx, char *line)
static int
cmd_learn (ASSUAN_CONTEXT ctx, char *line)
{
+ ctrl_t ctrl = assuan_get_pointer (ctx);
int rc;
- rc = agent_handle_learn (has_option (line, "--send")? ctx : NULL);
+ rc = agent_handle_learn (ctrl, has_option (line, "--send")? ctx : NULL);
if (rc)
log_error ("command learn failed: %s\n", gpg_strerror (rc));
return map_to_assuan_status (rc);
@@ -771,6 +772,7 @@ start_command_handler (int listen_fd, int fd)
else
{
rc = assuan_init_connected_socket_server (&ctx, fd);
+ ctrl.connection_fd = fd;
}
if (rc)
{
@@ -816,6 +818,8 @@ start_command_handler (int listen_fd, int fd)
}
}
+ /* Reset the SCD if needed. */
+ agent_reset_scd (&ctrl);
assuan_deinit_server (ctx);
if (ctrl.display)