mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
ff43d07819
commit
b17358948d
9 changed files with 157 additions and 93 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue