[svn] GnuPG - r4140 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-05-22 23:38:13 +0200 (Mon, 22 May 2006)
New Revision: 4140

Modified:
   trunk/g10/ChangeLog
   trunk/g10/import.c
Log:
* import.c (import_one): Fix bug when importing a new key from a file.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-05-22 17:19:22 UTC (rev 4139)
+++ trunk/g10/ChangeLog	2006-05-22 21:38:13 UTC (rev 4140)
@@ -1,5 +1,8 @@
 2006-05-22  David Shaw  <dshaw at jabberwocky.com>
 
+	* import.c (import_one): Fix bug when importing a new key from a
+	file.
+
 	* getkey.c (get_pubkey_byname), import.c (import_one): Fix key
 	selection problem when auto-key-locate returns a list of keys, not
 	all of which are usable (revoked, expired, etc).  Noted by Simon

Modified: trunk/g10/import.c
===================================================================
--- trunk/g10/import.c	2006-05-22 17:19:22 UTC (rev 4139)
+++ trunk/g10/import.c	2006-05-22 21:38:13 UTC (rev 4140)
@@ -978,16 +978,14 @@
       }
     else if(new_key)
       {
-	if(fpr && stats->imported==1)
+	if(fpr)
 	  {
 	    xfree(*fpr);
-	    *fpr=fingerprint_from_pk(pk,NULL,fpr_len);
+	    if(stats->imported==1)
+	      *fpr=fingerprint_from_pk(pk,NULL,fpr_len);
+	    else
+	      *fpr=NULL;
 	  }
-	else
-	  {
-	    xfree(*fpr);
-	    *fpr=NULL;
-	  }
 
 	revocation_present(keyblock);
 	if(seckey_available(keyid)==0)