diff options
| author | David Shaw <[email protected]> | 2003-04-26 20:38:16 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-04-26 20:38:16 +0000 |
| commit | a01bda6abdaa7e693b9637d3f467c348d0160db5 (patch) | |
| tree | 3143855966cee066a9abdb25739229494b662f52 /g10/options.h | |
| parent | * config.links: Re-disable assembler on Darwin. Darwin 6.5 broke it (diff) | |
| download | gnupg-a01bda6abdaa7e693b9637d3f467c348d0160db5.tar.gz gnupg-a01bda6abdaa7e693b9637d3f467c348d0160db5.zip | |
* sign.c (do_sign): Show the hash used when making a signature in verbose
mode.
* tdbio.h, tdbio.c (tdbio_read_model): New function to return the trust
model used in a given trustdb.
* options.h, g10.c (main), trustdb.c (init_trustdb, check_trustdb,
update_trustdb): Use tdbio_read_model to implement an "auto" trust model
which is set via the trustdb.
Diffstat (limited to 'g10/options.h')
| -rw-r--r-- | g10/options.h | 4 |
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; |