diff options
| author | Werner Koch <[email protected]> | 2005-06-03 13:57:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-06-03 13:57:24 +0000 |
| commit | f1dac8851d02a0cb63fc7379ee74692856d0cf39 (patch) | |
| tree | 79a731b1da742fe64ab4ee7fbca09f439954c032 /scd/command.c | |
| parent | Add stuff from gnulib. (diff) | |
| download | gnupg-f1dac8851d02a0cb63fc7379ee74692856d0cf39.tar.gz gnupg-f1dac8851d02a0cb63fc7379ee74692856d0cf39.zip | |
* command.c (cmd_updatestartuptty): New.
* gpg-agent.c: New option --write-env-file.
* gpg-agent.c (handle_connections): Make sure that the signals we
are handling are not blocked.Block signals while creating new
threads.
* estream.c: Use HAVE_CONFIG_H and not USE_CONFIG_H!
(es_func_fd_read, es_func_fd_write): Protect against EINTR.
* gpg-agent.texi (Agent UPDATESTARTUPTTY): New.
* scdaemon.c (handle_connections): Make sure that the signals we
are handling are not blocked.Block signals while creating new
threads.
(handle_connections): Include the file descriptor into the name of
the thread.
Diffstat (limited to '')
| -rw-r--r-- | scd/command.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scd/command.c b/scd/command.c index 738b1f003..287f8c921 100644 --- a/scd/command.c +++ b/scd/command.c @@ -253,12 +253,12 @@ open_card (ctrl_t ctrl, const char *apptype) if (ctrl->server_local->card_removed) return map_to_assuan_status (gpg_error (GPG_ERR_CARD_REMOVED)); - if (ctrl->app_ctx) - return 0; /* Already initialized for one specific application. */ - if ( IS_LOCKED (ctrl) ) return gpg_error (GPG_ERR_LOCKED); + if (ctrl->app_ctx) + return 0; /* Already initialized for one specific application. */ + if (ctrl->reader_slot != -1) slot = ctrl->reader_slot; else |