* g10.c (main), keydb.h, keydb.c (keydb_rebuild_caches), keyring.h,

keyring.c (keyring_rebuild_cache): Add "noisy" flag so cache rebuilds can
remain noisy when called for itself, and quiet when called as part of the
trustdb rebuild.

* trustdb.c (validate_keys): Rebuild the sig caches before building the
trustdb.  Note that this is going to require some architectual
re-thinking, as it is agonizingly slow.

1 files changed, 7 insertions, 0 deletions

diff --git a/g10/trustdb.c b/g10/trustdb.c
index 95d8c38c5..84212a3ce 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1944,6 +1944,13 @@ validate_keys (int interactive)
   KeyHashTable stored,used,full_trust;
   u32 start_time, next_expire;
 
+  /* Make sure we have all sigs cached.  TODO: This is going to
+     require some architectual re-thinking, as it is agonizingly slow.
+     Perhaps combine this with reset_trust_records(), or only check
+     the caches on keys that are actually involved in the web of
+     trust. */
+  keydb_rebuild_caches(0);
+
   start_time = make_timestamp ();
   next_expire = 0xffffffff; /* set next expire to the year 2106 */
   stored = new_key_hash_table ();