[git] GnuPG - branch, master, updated. gnupg-2.1.21-128-g609bbdf

[by Marcus Brinkmann]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  609bbdf3614fbadeba7a6cbdfdf5004b23516a64 (commit)
      from  d8a55da715ce8447b0686f321fa43d00be34a467 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 609bbdf3614fbadeba7a6cbdfdf5004b23516a64
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Fri Jul 21 16:03:04 2017 +0200

    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 <mb at g10code.com>
    GnuPG-bug-id: 2401

diff --git a/g10/import.c b/g10/import.c
index 1737479..c450367 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"),

-----------------------------------------------------------------------

Summary of changes:
 g10/import.c | 5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org