diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2009-11-02 18:47:11 +0100 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2009-11-02 18:47:11 +0100 |
| commit | 717c38381ad276cb453fefe401136b246f16d73a (patch) | |
| tree | 9bcd2451f6c167f190a3266e3ae8135b7755e58e /g13/server.c | |
| parent | [scd] Memory leak fix. (diff) | |
| download | gnupg2-717c38381ad276cb453fefe401136b246f16d73a.tar.xz gnupg2-717c38381ad276cb453fefe401136b246f16d73a.zip | |
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Diffstat (limited to 'g13/server.c')
| -rw-r--r-- | g13/server.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/g13/server.c b/g13/server.c index a6906aaa3..071e0326c 100644 --- a/g13/server.c +++ b/g13/server.c @@ -184,11 +184,13 @@ option_handler (assuan_context_t ctx, const char *key, const char *value) /* The handler for an Assuan RESET command. */ -static void -reset_notify (assuan_context_t ctx) +static gpg_error_t +reset_notify (assuan_context_t ctx, char *line) { ctrl_t ctrl = assuan_get_pointer (ctx); + (void)line; + xfree (ctrl->server_local->containername); ctrl->server_local->containername = NULL; @@ -196,6 +198,7 @@ reset_notify (assuan_context_t ctx) assuan_close_input_fd (ctx); assuan_close_output_fd (ctx); + return 0; } @@ -539,7 +542,7 @@ register_commands (assuan_context_t ctx) { static struct { const char *name; - gpg_error_t (*handler)(assuan_context_t, char *line); + assuan_handler_t handler; } table[] = { { "OPEN", cmd_open }, { "MOUNT", cmd_mount }, @@ -655,7 +658,7 @@ g13_server (ctrl_t ctrl) log_info ("Assuan accept problem: %s\n", gpg_strerror (err)); leave: - reset_notify (ctx); /* Release all items hold by SERVER_LOCAL. */ + reset_notify (ctx, NULL); /* Release all items hold by SERVER_LOCAL. */ if (ctrl->server_local) { xfree (ctrl->server_local); |