[svn] GnuPG - r5340 - branches/STABLE-BRANCH-2-0/agent

[svn author wk]

Author: wk
Date: 2010-05-12 13:03:28 +0200 (Wed, 12 May 2010)
New Revision: 5340

Modified:
   branches/STABLE-BRANCH-2-0/agent/ChangeLog
   branches/STABLE-BRANCH-2-0/agent/preset-passphrase.c
Log:
Fix bug#1198


Modified: branches/STABLE-BRANCH-2-0/agent/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/ChangeLog	2010-05-12 10:53:02 UTC (rev 5339)
+++ branches/STABLE-BRANCH-2-0/agent/ChangeLog	2010-05-12 11:03:28 UTC (rev 5340)
@@ -1,5 +1,8 @@
 2010-05-12  Werner Koch  <wk at g10code.com>
 
+	* 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  <wk at g10code.com>

Modified: branches/STABLE-BRANCH-2-0/agent/preset-passphrase.c
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/preset-passphrase.c	2010-05-12 10:53:02 UTC (rev 5339)
+++ branches/STABLE-BRANCH-2-0/agent/preset-passphrase.c	2010-05-12 11:03:28 UTC (rev 5340)
@@ -189,11 +189,15 @@
 
   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);
 }