[svn] GnuPG - r4984 - trunk/agent

[svn author marcus]

Author: marcus
Date: 2009-04-14 22:36:14 +0200 (Tue, 14 Apr 2009)
New Revision: 4984

Modified:
   trunk/agent/ChangeLog
   trunk/agent/call-pinentry.c
Log:
2009-04-14  Marcus Brinkmann  <marcus at g10code.de>

	* call-pinentry.c (agent_get_confirmation): Try SETNOTOK command
	with pinentry.


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2009-04-06 03:18:30 UTC (rev 4983)
+++ trunk/agent/ChangeLog	2009-04-14 20:36:14 UTC (rev 4984)
@@ -1,3 +1,8 @@
+2009-04-14  Marcus Brinkmann  <marcus at g10code.de>
+
+	* call-pinentry.c (agent_get_confirmation): Try SETNOTOK command
+	with pinentry.
+
 2009-04-01  Werner Koch  <wk at g10code.com>
 
 	* protect-tool.c (pe_opt): New.

Modified: trunk/agent/call-pinentry.c
===================================================================
--- trunk/agent/call-pinentry.c	2009-04-06 03:18:30 UTC (rev 4983)
+++ trunk/agent/call-pinentry.c	2009-04-14 20:36:14 UTC (rev 4984)
@@ -870,9 +870,15 @@
     }
   if (cancel)
     {
-      snprintf (line, DIM(line)-1, "SETCANCEL %s", cancel);
+      snprintf (line, DIM(line)-1, "SETNOTOK %s", cancel);
       line[DIM(line)-1] = 0;
       rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
+      if (gpg_err_code (rc) == GPG_ERR_ASS_UNKNOWN_CMD)
+	{
+	  snprintf (line, DIM(line)-1, "SETCANCEL %s", cancel);
+	  line[DIM(line)-1] = 0;
+	  rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
+	}
       if (rc)
         return unlock_pinentry (rc);
     }