aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno <[email protected]>2015-11-09 04:20:13 +0000
committerWerner Koch <[email protected]>2015-12-04 15:39:10 +0000
commitb5cd68852d0e3485c9e13a8ddb70f05f36a65cb9 (patch)
tree174cfd055e0b618d22f70d59565e5ad12ad17941
parentdirmngr: Stricter handling of http error codes. (diff)
downloadgnupg-b5cd68852d0e3485c9e13a8ddb70f05f36a65cb9.tar.gz
gnupg-b5cd68852d0e3485c9e13a8ddb70f05f36a65cb9.zip
gpg: Write ERROR status on delete-key cancellation
* g10/delkey.c (do_delete_key): Write ERROR status code with the error location "delete_key.secret", when the user cancelled the operation on Pinentry. -- I changed the original patch to emit the full gpg_error_t code. -wk
-rw-r--r--g10/delkey.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/g10/delkey.c b/g10/delkey.c
index b0a2b0d55..5d0c3dffb 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -201,7 +201,10 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
firsterr = err;
if (gpg_err_code (err) == GPG_ERR_CANCELED
|| gpg_err_code (err) == GPG_ERR_FULLY_CANCELED)
- break;
+ {
+ write_status_error ("delete_key.secret", err);
+ break;
+ }
}
}