diff options
| author | Stefan Bellon <[email protected]> | 2002-09-21 23:59:59 +0000 |
|---|---|---|
| committer | Stefan Bellon <[email protected]> | 2002-09-21 23:59:59 +0000 |
| commit | 78c754cd70d35189fa577783d0e257d0c8beaddb (patch) | |
| tree | 7342c8aef7644ba685dfd4b2e4c6c759f1300c9f | |
| parent | trustdb checks/updates after import (diff) | |
| download | gnupg-78c754cd70d35189fa577783d0e257d0c8beaddb.tar.gz gnupg-78c754cd70d35189fa577783d0e257d0c8beaddb.zip | |
added trustdb update/check for stream import as well
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/import.c | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index acfef8d81..e7a11610e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,7 +1,8 @@ -2002-09-21 Stefan Bellon <[email protected]> +2002-09-22 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. + * import.c (import_keys, import_keys_stream): 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]> diff --git a/g10/import.c b/g10/import.c index f02efe6d2..5d38e04f2 100644 --- a/g10/import.c +++ b/g10/import.c @@ -236,6 +236,18 @@ import_keys_stream( IOBUF inp, int fast, 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(); + } + return rc; } |