diff options
| author | Marcus Brinkmann <[email protected]> | 2017-07-21 14:03:04 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2017-07-21 14:04:17 +0000 |
| commit | 609bbdf3614fbadeba7a6cbdfdf5004b23516a64 (patch) | |
| tree | f24801f7acd0b40652d4fc1c15f8d8bc956737de /g10/import.c | |
| parent | scd: Fix SEGV in CCID driver. (diff) | |
| download | gnupg-609bbdf3614fbadeba7a6cbdfdf5004b23516a64.tar.gz gnupg-609bbdf3614fbadeba7a6cbdfdf5004b23516a64.zip | |
g10: Clean keyblock on initial commit.
* g10/import.c (import_one): If option import-clean is set,
also clean on initial import, not only for merge.
Signed-off-by: Marcus Brinkmann <[email protected]>
GnuPG-bug-id: 2401
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/g10/import.c b/g10/import.c index 1737479fa..c45036783 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1606,6 +1606,7 @@ import_one (ctrl_t ctrl, else if (rc ) /* Insert this key. */ { KEYDB_HANDLE hd; + int n_sigs_cleaned, n_uids_cleaned; hd = keydb_new (); if (!hd) @@ -1635,6 +1636,10 @@ import_one (ctrl_t ctrl, } } + if ((options & IMPORT_CLEAN)) + clean_key (ctrl, keyblock, opt.verbose, (options&IMPORT_MINIMAL), + &n_uids_cleaned,&n_sigs_cleaned); + rc = keydb_insert_keyblock (hd, keyblock ); if (rc) log_error (_("error writing keyring '%s': %s\n"), |