1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

Collected changes

This commit is contained in:
Werner Koch 2010-05-03 11:10:49 +00:00
parent 1dfd0e0eda
commit 830af45ca2
10 changed files with 129 additions and 21 deletions

View file

@ -176,6 +176,17 @@ agent_scd_dump_state (void)
static int
unlock_scd (ctrl_t ctrl, int rc)
{
if (gpg_err_code (rc) == GPG_ERR_NOT_OPERATIONAL
&& gpg_err_source (rc) == GPG_ERR_SOURCE_SCD)
{
/* If the SCdaemon returned this error, it detected a major
problem, like no reader connected. To finish this we need to
stop the connection. This simulates an explicit killing of
the SCdaemon. */
assuan_transact (primary_scd_ctx, "BYE",
NULL, NULL, NULL, NULL, NULL, NULL);
}
if (ctrl->scd_local->locked != 1)
{
log_error ("unlock_scd: invalid lock count (%d)\n",