diff options
| author | Stefan Bellon <sbellon@sbellon.de> | 2002-09-21 23:57:22 +0200 |
|---|---|---|
| committer | Stefan Bellon <sbellon@sbellon.de> | 2002-09-21 23:57:22 +0200 |
| commit | b9c091bd86d317ab78e15b3a5d5ef7bf8eea340f (patch) | |
| tree | 9816457c56183d4ee77e0b0cb462b9e7aa5e372a /g10 | |
| parent | * gpg.sgml: Some minor language cleanup. (diff) | |
| download | gnupg2-b9c091bd86d317ab78e15b3a5d5ef7bf8eea340f.tar.xz gnupg2-b9c091bd86d317ab78e15b3a5d5ef7bf8eea340f.zip | |
trustdb checks/updates after import
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/import.c | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 9ada90a51..acfef8d81 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2002-09-21 Stefan Bellon <sbellon@sbellon.de> + + * import.c (import_keys): Added trustdb update/check to key import + if not fast-import and interactive set/no-auto-check-trustdb unset. + 2002-09-19 David Shaw <dshaw@jabberwocky.com> * keyserver.c (keyserver_spawn): Properly handle line truncation. diff --git a/g10/import.c b/g10/import.c index 4060bdf27..f02efe6d2 100644 --- a/g10/import.c +++ b/g10/import.c @@ -207,7 +207,17 @@ import_keys( char **fnames, int nnames, int fast, import_print_stats (stats); import_release_stats_handle (stats); } - + /* If no fast import and we really added new keys or merged new + user ids, signatures or revocations, then update/check the + trustdb if the user specified by setting interactive or by + not setting no-auto-check-trustdb */ + if (!fast && (stats->imported || stats->n_uids || + stats->n_sigs || stats->n_revoc)) { + if (opt.interactive) + update_trustdb(); + else if (!opt.no_auto_check_trustdb) + check_trustdb(); + } } int |