aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2020-11-10 14:08:24 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2020-11-10 14:08:24 +0900
commitf9bbc751633f38f58fecb71c33aae735e9b30241 (patch)
treea54e966ecb19174c1cb05809ee260d2133307b0b
parent9854369a729b9fde43eac2e2f7154f5187378787 (diff)
downloadgnupg-f9bbc751633f38f58fecb71c33aae735e9b30241.tar.gz
gpg: In batch mode, delete-secret-key is not okay without --yes.
* g10/delkey.c (do_delete_key): Emit an error when not --yes. -- GnuPG-bug-id: 4667 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-rw-r--r--g10/delkey.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/g10/delkey.c b/g10/delkey.c
index b89451089..05b9301ee 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -151,7 +151,12 @@ do_delete_key (ctrl_t ctrl, const char *username, int secret, int force,
if (opt.batch && exactmatch)
- okay++;
+ {
+ if (!opt.answer_yes && secret)
+ log_error(_("can't do this in batch mode without \"--yes\"\n"));
+ else
+ okay++;
+ }
else if (opt.batch && secret)
{
log_error(_("can't do this in batch mode\n"));