From a1b94b92c8c1324357e80d413b4fb2d2479fbd11 Mon Sep 17 00:00:00 2001
From: Timo Schulz <twoaday@freakmail.de>
Date: Mon, 23 Dec 2002 19:31:05 +0000
Subject: [PATCH] 2002-12-23  Timo Schulz  <ts@winpt.org>

        * import.c (import_one): Use merge_keys_and_selfsig in the
        interactive mode to avoid wrong key information.
---
 g10/ChangeLog | 5 +++++
 g10/import.c  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 04a33c35f..693d3a114 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-23  Timo Schulz  <ts@winpt.org>
+
+	* import.c (import_one): Use merge_keys_and_selfsig in the
+	interactive mode to avoid wrong key information.
+	
 2002-12-18  David Shaw  <dshaw@jabberwocky.com>
 
 	* keydb.h, getkey.c (key_byname): Flag to enable or disable
diff --git a/g10/import.c b/g10/import.c
index a7a296174..e8de666f1 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -591,6 +591,7 @@ import_one( const char *fname, KBNODE keyblock, int fast,
     }
     
     if (opt.interactive) {
+        merge_keys_and_selfsig (keyblock);
         tty_printf ("\n");
         show_basic_key_info (keyblock);
         tty_printf ("\n");