diff options
Diffstat (limited to '')
| -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 <[email protected]> + + * 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 <[email protected]> * 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 |