diff options
| author | Werner Koch <[email protected]> | 2010-05-12 11:03:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-05-12 11:03:28 +0000 |
| commit | 8cea3321cc09ba34cfa8fd65d76aab3c33287ed8 (patch) | |
| tree | c1daf616690b0308d8512961a7ce13ce7bc57781 | |
| parent | Fix bug 1207 (diff) | |
| download | gnupg-8cea3321cc09ba34cfa8fd65d76aab3c33287ed8.tar.gz gnupg-8cea3321cc09ba34cfa8fd65d76aab3c33287ed8.zip | |
Fix bug#1198
| -rw-r--r-- | agent/ChangeLog | 3 | ||||
| -rw-r--r-- | agent/preset-passphrase.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 5c3143c71..3c1aa54df 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,5 +1,8 @@ 2010-05-12 Werner Koch <[email protected]> + * preset-passphrase.c (forget_passphrase): Actually implement + this. Fixes bug#1198. + * gpg-agent.c (handle_tick): Do not print die message with option -q. 2010-05-11 Werner Koch <[email protected]> diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index 8e3b3e2c5..72de91b7c 100644 --- a/agent/preset-passphrase.c +++ b/agent/preset-passphrase.c @@ -189,11 +189,15 @@ forget_passphrase (const char *keygrip) rc = asprintf (&line, "CLEAR_PASSPHRASE %s\n", keygrip); if (rc < 0) + rc = gpg_error_from_syserror (); + else + rc = map_spwq_error (simple_query (line)); + if (rc) { - log_error ("clearing passphrase failed: %s\n", - gpg_strerror (gpg_error_from_syserror ())); + log_error ("clearing passphrase failed: %s\n", gpg_strerror (rc)); return; } + xfree (line); } |