aboutsummaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-11-03 20:18:56 +0000
committerDavid Shaw <[email protected]>2002-11-03 20:18:56 +0000
commit91a8e4a6fb15994eea58ff2bab9403c5456af6a1 (patch)
treee761564473a03432673c05f4fa8824384ebcadc8 /g10/options.h
parent* gpg.sgml: Document "tsign", clarify "setpref", clarify --recipient, (diff)
downloadgnupg-91a8e4a6fb15994eea58ff2bab9403c5456af6a1.tar.gz
gnupg-91a8e4a6fb15994eea58ff2bab9403c5456af6a1.zip
* options.h, g10.c (main): Add --trust-model option. Current models are
"openpgp" which is classic+trustsigs, "classic" which is classic only, and "always" which is the same as the current option --always-trust (which still works). Default is "openpgp". * trustdb.c (validate_one_keyblock): Use "openpgp" trust model to enable trust sigs. * gpgv.c (main), mainproc.c (check_sig_and_print), pkclist.c (do_we_trust, do_we_trust_pre, check_signatures_trust): Use new --trust-model option in place of --always-trust.
Diffstat (limited to 'g10/options.h')
-rw-r--r--g10/options.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/options.h b/g10/options.h
index 6be587ab8..1edec5817 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -88,7 +88,7 @@ struct {
int skip_verify;
int compress_keys;
int compress_sigs;
- int always_trust;
+ enum {TM_OPENPGP, TM_CLASSIC, TM_ALWAYS} trust_model;
int pgp2;
int pgp6;
int pgp7; /* if we get any more of these, it's time to look at a