mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +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
|
@ -123,8 +123,8 @@ mk_notation_and_policy( PKT_signature *sig,
|
|||
m_free(buf);
|
||||
}
|
||||
|
||||
if(opt.show_notation)
|
||||
show_notation(sig,0);
|
||||
if(opt.list_options&LIST_SHOW_NOTATION)
|
||||
show_notation(sig,0,0);
|
||||
|
||||
/* set policy URL */
|
||||
if( IS_SIG(sig) && opt.sig_policy_url )
|
||||
|
@ -161,8 +161,8 @@ mk_notation_and_policy( PKT_signature *sig,
|
|||
m_free(s);
|
||||
}
|
||||
|
||||
if(opt.show_policy_url)
|
||||
show_policy_url(sig,0);
|
||||
if(opt.list_options&LIST_SHOW_POLICY)
|
||||
show_policy_url(sig,0,0);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue