diff options
| author | David Shaw <[email protected]> | 2006-03-07 20:14:20 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-03-07 20:14:20 +0000 |
| commit | 4f9efb7a79b652e0594ffbb120e466dc6732afe6 (patch) | |
| tree | 454c704451edde941e608a220eb62c3c893d383d /g10/mainproc.c | |
| parent | * NEWS: Note --auto-key-locate and that keyservers can handle binary data (diff) | |
| download | gnupg-4f9efb7a79b652e0594ffbb120e466dc6732afe6.tar.gz gnupg-4f9efb7a79b652e0594ffbb120e466dc6732afe6.zip | |
* options.h, gpg.c (main, parse_trust_model), pkclist.c
(check_signatures_trust), mainproc.c (check_sig_and_print,
pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it
is a verify-option now.
Diffstat (limited to '')
| -rw-r--r-- | g10/mainproc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index cc865a833..8c8262f58 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1390,7 +1390,7 @@ pka_uri_from_sig (PKT_signature *sig) assert (!sig->pka_info); sig->flags.pka_tried = 1; sig->pka_info = get_pka_address (sig); - if (sig->pka_info && opt.allow_pka_lookup) + if (sig->pka_info) { char *uri; @@ -1866,7 +1866,8 @@ check_sig_and_print( CTX c, KBNODE node ) if (!rc) { - pka_uri_from_sig (sig); /* Make sure PKA info is available. */ + if(opt.verify_options&VERIFY_PKA_LOOKUP) + pka_uri_from_sig (sig); /* Make sure PKA info is available. */ rc = check_signatures_trust( sig ); } |