diff options
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index c8f3e4bad..95d419ab5 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2115,7 +2115,10 @@ import_one_real (ctrl_t ctrl, if (err) goto leave; - if ((options & IMPORT_CLEAN)) + /* Clean the final keyblock again if requested. we can't do + * this if only self-signatures are imported; see bug #4628. */ + if ((options & IMPORT_CLEAN) + && !(options & IMPORT_SELF_SIGS_ONLY)) { merge_keys_and_selfsig (ctrl, keyblock_orig); clean_all_uids (ctrl, keyblock_orig, opt.verbose, |