diff options
| author | Justus Winter <[email protected]> | 2017-07-14 09:17:49 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-07-14 09:17:49 +0000 |
| commit | 956da89193370d5aa970cff5b77f605534481a02 (patch) | |
| tree | d79b8ccc176eacd79943929291fecda29d459933 | |
| parent | gpg: Pass key origin values to import functions. (diff) | |
| download | gnupg-956da89193370d5aa970cff5b77f605534481a02.tar.gz gnupg-956da89193370d5aa970cff5b77f605534481a02.zip | |
gpg: Fix importing keys.
* g10/import.c (import_one): Fix error handling.
Fixes-commit: 330212efb927c119bb5135856f8582c0e4e2e6b7
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/import.c b/g10/import.c index 8010fa521..1737479fa 100644 --- a/g10/import.c +++ b/g10/import.c @@ -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 ); |