Merge branch 'STABLE-BRANCH-1-4' of git+ssh://playfair.gnupg.org/git/gnupg into STABL...
authorDavid Shaw <dshaw@jabberwocky.com>
Fri, 20 Jan 2012 03:34:45 +0000 (22:34 -0500)
committerDavid Shaw <dshaw@jabberwocky.com>
Fri, 20 Jan 2012 03:34:45 +0000 (22:34 -0500)
1  2 
g10/tdbio.h

diff --cc g10/tdbio.h
@@@ -54,13 -54,9 +54,10 @@@ struct trust_record 
            byte  completes;
            byte  cert_depth;
            byte  trust_model;
 +          byte  min_cert_level;
            ulong created;   /* timestamp of trustdb creation  */
            ulong nextcheck; /* timestamp of next scheduled check */
-           ulong reserved;  
-           ulong reserved2;
            ulong firstfree;
-           ulong reserved3;
              ulong trusthashtbl;
        } ver;
        struct {            /* free record */