* packet.h, tdbio.h, tdbio.c (tdbio_read_record, tdbio_write_record),

trustdb.c (update_validity): Store temporary full & marginal counts in the
trustdb. (clear_validity, get_validity_counts): Return and clear temp
counts. (store_validation_status): Keep track of which keyids have been
stored. (validate_one_keyblock, validate_key_list): Use per-uid copies of
the full & marginal counts so they can be recalled for multiple levels.
(validate_keys): Only use unused keys for each new round.
(reset_unconnected_keys): Rename to reset_trust_records, and only skip
specifically excluded records.

1 files changed, 3 insertions, 1 deletions

diff --git a/g10/tdbio.h b/g10/tdbio.h
index 91a73efe6..26503dc0d 100644
--- a/g10/tdbio.h
+++ b/g10/tdbio.h
@@ -50,7 +50,7 @@ struct trust_record {
     ulong recnum;
     union {
 	struct {	     /* version record: */
-	    byte version;    /* should be 3 */
+	    byte  version;   /* should be 3 */
 	    byte  marginals;
 	    byte  completes;
 	    byte  cert_depth;
@@ -84,6 +84,8 @@ struct trust_record {
         byte namehash[20];
         ulong next;  
         byte validity;
+	byte full_count;
+	byte marginal_count;
       } valid;
     } r;
 };