mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
* import.c (import_one): Fix bug when importing a new key from a file.
This commit is contained in:
parent
a26d0ff496
commit
3bee120e15
@ -1,5 +1,8 @@
|
|||||||
2006-05-22 David Shaw <dshaw@jabberwocky.com>
|
2006-05-22 David Shaw <dshaw@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
|
* getkey.c (get_pubkey_byname), import.c (import_one): Fix key
|
||||||
selection problem when auto-key-locate returns a list of keys, not
|
selection problem when auto-key-locate returns a list of keys, not
|
||||||
all of which are usable (revoked, expired, etc). Noted by Simon
|
all of which are usable (revoked, expired, etc). Noted by Simon
|
||||||
|
@ -978,14 +978,12 @@ import_one( const char *fname, KBNODE keyblock, struct stats_s *stats,
|
|||||||
}
|
}
|
||||||
else if(new_key)
|
else if(new_key)
|
||||||
{
|
{
|
||||||
if(fpr && stats->imported==1)
|
if(fpr)
|
||||||
{
|
{
|
||||||
xfree(*fpr);
|
xfree(*fpr);
|
||||||
|
if(stats->imported==1)
|
||||||
*fpr=fingerprint_from_pk(pk,NULL,fpr_len);
|
*fpr=fingerprint_from_pk(pk,NULL,fpr_len);
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
xfree(*fpr);
|
|
||||||
*fpr=NULL;
|
*fpr=NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user