From bbe388b5db35be6ffece8ebd42f11372af016763 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 7 Jun 2010 13:33:02 +0000 Subject: Add unfinished gpgtar. Collected changes and ports of bug fixes from stable. --- agent/ChangeLog | 5 +++++ agent/preset-passphrase.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'agent') diff --git a/agent/ChangeLog b/agent/ChangeLog index 35ea9e038..91dd3acf3 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2010-05-12 Werner Koch + + * preset-passphrase.c (forget_passphrase): Actually implement + this. Fixes bug#1198. + 2010-05-11 Werner Koch * agent.h (opt): Add field USE_STANDARD_SOCKET. diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index 89542c67e..ae202bf65 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); } -- cgit v1.2.3