gpg: Fix for overridden key import.

* g10/import.c (do_transfer): Force the overridden key import
even when smartcard is available.

--

Fixes-commit: 2c12970550
GnuPG-bug-id: 3456
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

g10/import.c

@@ -2958,7 +2958,7 @@ do_transfer (ctrl_t ctrl, kbnode_t keyblock, PKT_public_key *pk,
   int force = 0;
   int already_exist = agent_probe_secret_key (ctrl, pk);
 
-  if (already_exist == 2)
+  if (already_exist == 2 || already_exist == 4)
     {
       if (!opt.quiet)
         log_info (_("key %s: card reference is overridden by key material\n"),