diff options
| author | David Shaw <[email protected]> | 2003-05-01 21:37:08 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-05-01 21:37:08 +0000 |
| commit | f861b6488ecc87e8dbc3ab45a1eca3189cf24834 (patch) | |
| tree | 9a30d79c54be728b724398288db9d7c438bedd09 /g10/options.h | |
| parent | * build-packet.c (build_sig_subpkt): Comments. (diff) | |
| download | gnupg-f861b6488ecc87e8dbc3ab45a1eca3189cf24834.tar.gz gnupg-f861b6488ecc87e8dbc3ab45a1eca3189cf24834.zip | |
* tdbio.c (create_version_record): Only create new trustdbs with
TM_CLASSIC or TM_PGP.
* trustdb.h, trustdb.c (trust_string, get_ownertrust_string,
get_validity_string, ask_ownertrust, validate_keys), pkclist.c
(do_edit_ownertrust): Rename trust_string to trust_value_to_string for
naming consistency.
* trustdb.h, trustdb.c (string_to_trust_value): New function to translate
a string to a trust value.
* g10.c (main): Use string_to_trust_value here for --force-ownertrust.
* options.h, g10.c (main), trustdb.c (trust_model_string, init_trustdb,
check_trustdb, update_trustdb, get_validity, validate_one_keyblock): An
"OpenPGP" trust model is misleading since there is no official OpenPGP
trust model. Use "PGP" instead.
Diffstat (limited to '')
| -rw-r--r-- | g10/options.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/options.h b/g10/options.h index 98dba2eeb..69dc2119f 100644 --- a/g10/options.h +++ b/g10/options.h @@ -91,7 +91,7 @@ struct { int compress_sigs; /* 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; + enum {TM_CLASSIC=0, TM_PGP=1, TM_ALWAYS, TM_AUTO} trust_model; unsigned int force_ownertrust; int pgp2; int pgp6; |