From 79b51bb8727bd3485229ac8ff5987558156d5d83 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 24 Dec 2015 14:19:53 +0900 Subject: agent: IMPORT_KEY with --force option fix. * agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not to check existing key. (convert_from_openpgp): Ditto. (convert_from_openpgp_native): Call convert_from_openpgp_main with dontcare_exist=0. * agent/command.c (cmd_import_key): Call with dontcare_exist=force. --- agent/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'agent/command.c') diff --git a/agent/command.c b/agent/command.c index 446cf2433..718a5e6bb 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2151,7 +2151,7 @@ cmd_import_key (assuan_context_t ctx, char *line) xfree (key); key = NULL; - err = convert_from_openpgp (ctrl, openpgp_sexp, grip, + err = convert_from_openpgp (ctrl, openpgp_sexp, force, grip, ctrl->server_local->keydesc, cache_nonce, &key, opt_unattended? NULL : &passphrase); if (err) -- cgit v1.2.3