security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

gpg: Fix importing keys. 

* g10/import.c (import_one): Fix error handling.

Fixes-commit: 330212efb9
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-07-14 11:17:49 +02:00
parent 330212efb9
commit 956da89193
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/import.c
View File

@ -1627,9 +1627,12 @@ import_one (ctrl_t ctrl,
if ( !(options & IMPORT_RESTORE) )
{
rc = apply_meta_data (keyblock, 0, origin);
log_error ("apply_meta_data failed: %s\n", gpg_strerror (rc));
keydb_release (hd);
return GPG_ERR_GENERAL;
if (rc)
{
log_error ("apply_meta_data failed: %s\n", gpg_strerror (rc));
keydb_release (hd);
return GPG_ERR_GENERAL;
}
}
rc = keydb_insert_keyblock (hd, keyblock );