diff options
| author | David Shaw <[email protected]> | 2003-05-31 23:23:19 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-05-31 23:23:19 +0000 |
| commit | b17358948de8a71e94f59390e128665e7466bb8c (patch) | |
| tree | e3cde5cef2119ae2e05ca0e476a1f6d6e97679c5 /g10/pkclist.c | |
| parent | * main.h, misc.c (parse_options): New general option line parser. Fix the (diff) | |
| download | gnupg-b17358948de8a71e94f59390e128665e7466bb8c.tar.gz gnupg-b17358948de8a71e94f59390e128665e7466bb8c.zip | |
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy,
show_notation): Collapse the old print_notation_data into show_policy()
and show_notation() so there is only one function to print notations and
policy URLs.
* options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig),
keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust),
sign.c (mk_notation_and_policy): New "list-options" and "verify-options"
commands. These replace the existing --show-photos/--no-show-photos,
--show-notation/--no-show-notation,
--show-policy-url/--no-show-policy-url, and --show-keyring options. The
new method is more flexible since a user can specify (for example) showing
photos during sig verification, but not in key listings. The old options
are emulated.
Diffstat (limited to 'g10/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 803c6f60d..e6c826963 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -294,7 +294,8 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, !un->pkt->pkt.user_id->attrib_data ) continue; - if(opt.show_photos && un->pkt->pkt.user_id->attrib_data) + if((opt.verify_options&VERIFY_SHOW_PHOTOS) + && un->pkt->pkt.user_id->attrib_data) show_photos(un->pkt->pkt.user_id->attribs, un->pkt->pkt.user_id->numattribs,pk,NULL); |