diff options
| author | Werner Koch <[email protected]> | 2005-05-21 18:49:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-05-21 18:49:00 +0000 |
| commit | 05e1dc22f0feef8d5af7c8bbb0c0a5129f2c0b05 (patch) | |
| tree | a893c537329394cab1c954b2606e6d94d1846fe9 /scd | |
| parent | * protect-tool.c: New option --canonical. (diff) | |
| download | gnupg-05e1dc22f0feef8d5af7c8bbb0c0a5129f2c0b05.tar.gz gnupg-05e1dc22f0feef8d5af7c8bbb0c0a5129f2c0b05.zip | |
* call-scd.c (start_scd): Don't test for an alive scdaemon here.
(agent_scd_check_aliveness): New.
* gpg-agent.c (handle_tick): Test for an alive scdaemon.
(handle_signal): Print thread info on SIGUSR1.
* scdaemon.c (handle_signal): Print thread info on SIGUSR1.
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 4 | ||||
| -rw-r--r-- | scd/app-openpgp.c | 2 | ||||
| -rw-r--r-- | scd/scdaemon.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index c64fbec7e..feeaabfce 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,7 @@ +2005-05-21 Werner Koch <[email protected]> + + * scdaemon.c (handle_signal): Print thread info on SIGUSR1. + 2005-05-20 Werner Koch <[email protected]> * ccid-driver.c: Replaced macro DEBUG_T1 by a new debug level. diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 16ebd34c8..1165ec683 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -1634,7 +1634,7 @@ do_writekey (app_t app, ctrl_t ctrl, log_info ("protected-private-key passed to writekey\n"); else if (toklen == 20 && !memcmp ("shadowed-private-key", tok, toklen)) log_info ("shadowed-private-key passed to writekey\n"); - err = gpg_error (GPG_ERR_BAD_KEY); + err = gpg_error (GPG_ERR_BAD_SECKEY); goto leave; } if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))) diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 1110d9d76..488a4853b 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -807,7 +807,8 @@ handle_signal (int signo) break; case SIGUSR1: - log_info ("SIGUSR1 received - no action defined\n"); + log_info ("SIGUSR1 received - printing internal information:\n"); + pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); break; case SIGUSR2: |