diff options
| author | Marcus Brinkmann <[email protected]> | 2009-04-14 20:36:14 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-04-14 20:36:14 +0000 |
| commit | 6763dd76e0fad20a6dada07ba7b0c1cc8d61ee0a (patch) | |
| tree | cb0eead4d1918ab850a473abf4c3ca947637e09f | |
| parent | Make gpgv error message about a missing keyring more useful. This fixes (diff) | |
| download | gnupg-6763dd76e0fad20a6dada07ba7b0c1cc8d61ee0a.tar.gz gnupg-6763dd76e0fad20a6dada07ba7b0c1cc8d61ee0a.zip | |
2009-04-14 Marcus Brinkmann <[email protected]>
* call-pinentry.c (agent_get_confirmation): Try SETNOTOK command
with pinentry.
Diffstat (limited to '')
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/call-pinentry.c | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index e691ad7e6..7c948e4c1 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2009-04-14 Marcus Brinkmann <[email protected]> + + * call-pinentry.c (agent_get_confirmation): Try SETNOTOK command + with pinentry. + 2009-04-01 Werner Koch <[email protected]> * protect-tool.c (pe_opt): New. diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index c840bb68d..38561e3e8 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -870,9 +870,15 @@ agent_get_confirmation (ctrl_t ctrl, } 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); } |