diff options
| author | NIIBE Yutaka <[email protected]> | 2015-12-24 05:19:53 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-12-24 05:19:53 +0000 |
| commit | 79b51bb8727bd3485229ac8ff5987558156d5d83 (patch) | |
| tree | 4ff9623fdcaa0da34a24323689bbd5819750a687 /agent/command.c | |
| parent | g10: Use --force when importing key for bkuptocard. (diff) | |
| download | gnupg-79b51bb8727bd3485229ac8ff5987558156d5d83.tar.gz gnupg-79b51bb8727bd3485229ac8ff5987558156d5d83.zip | |
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.
Diffstat (limited to 'agent/command.c')
| -rw-r--r-- | agent/command.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |