From 5ca57f1a697e875bae5a5c73f1a580c42ca75343 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 24 Dec 2015 14:15:58 +0900 Subject: g10: Use --force when importing key for bkuptocard. * g10/call-agent.c (agent_import_key): Add an argument FORCE. * g10/import.c (transfer_secret_keys): Likewise. (import_secret_one): Call transfer_secret_keys with FORCE=0. * g10/keyedit.c (keyedit_menu): Call with FORCE=1. --- g10/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/main.h') diff --git a/g10/main.h b/g10/main.h index 06f2577ec..06821722a 100644 --- a/g10/main.h +++ b/g10/main.h @@ -338,7 +338,7 @@ import_stats_t import_new_stats_handle (void); void import_release_stats_handle (import_stats_t hd); void import_print_stats (import_stats_t hd); gpg_error_t transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, - kbnode_t sec_keyblock, int batch); + kbnode_t sec_keyblock, int batch, int force); int collapse_uids( KBNODE *keyblock ); -- cgit v1.2.3