1 files changed, 3 insertions, 1 deletions
diff --git a/g10/options.h b/g10/options.h
index a2868e493..98dba2eeb 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -89,7 +89,9 @@ struct {
     int skip_verify;
     int compress_keys;
     int compress_sigs;
-    enum {TM_CLASSIC=0, TM_OPENPGP=1, TM_ALWAYS} trust_model;
+    /* TM_CLASSIC must be zero to accomodate trustdbs generated before
+       we started storing the trust model inside the trustdb. */
+    enum {TM_CLASSIC=0, TM_OPENPGP=1, TM_ALWAYS, TM_AUTO} trust_model;
     unsigned int force_ownertrust;
     int pgp2;
     int pgp6;