aboutsummaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--scd/ChangeLog4
-rw-r--r--scd/app-openpgp.c2
-rw-r--r--scd/scdaemon.c3
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: