diff options
| author | David Shaw <[email protected]> | 2002-11-03 20:18:56 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-03 20:18:56 +0000 |
| commit | 91a8e4a6fb15994eea58ff2bab9403c5456af6a1 (patch) | |
| tree | e761564473a03432673c05f4fa8824384ebcadc8 /g10/mainproc.c | |
| parent | * gpg.sgml: Document "tsign", clarify "setpref", clarify --recipient, (diff) | |
| download | gnupg-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/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 0fc3a8546..c07a377eb 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1382,7 +1382,7 @@ check_sig_and_print( CTX c, KBNODE node ) } } - if (opt.always_trust || !un) + if (opt.trust_model==TM_ALWAYS || !un) keyid_str[17] = 0; /* cut off the "[uncertain]" part */ write_status_text_and_buffer (statno, keyid_str, @@ -1393,7 +1393,7 @@ check_sig_and_print( CTX c, KBNODE node ) log_info(rc? _("BAD signature from \"") : sig->flags.expired ? _("Expired signature from \"") : _("Good signature from \"")); - if (!opt.always_trust && un) { + if (opt.trust_model!=TM_ALWAYS && un) { fputs(_("[uncertain]"), log_stream() ); putc(' ', log_stream() ); } |