mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the
plurarility (or not) of various list and verify options.
This commit is contained in:
parent
fbadc93876
commit
80caf9957f
6 changed files with 81 additions and 73 deletions
|
@ -1306,7 +1306,7 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
|
||||
tstr = asctimestamp(sig->timestamp);
|
||||
astr = pubkey_algo_to_string( sig->pubkey_algo );
|
||||
if(opt.verify_options&VERIFY_SHOW_LONG_KEYID)
|
||||
if(opt.verify_options&VERIFY_SHOW_LONG_KEYIDS)
|
||||
{
|
||||
log_info(_("Signature made %.*s\n"),(int)strlen(tstr), tstr);
|
||||
log_info(_(" using %s key %08lX%08lX\n"),
|
||||
|
@ -1499,17 +1499,17 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
|
||||
if( !rc )
|
||||
{
|
||||
if(opt.verify_options&VERIFY_SHOW_POLICY)
|
||||
if(opt.verify_options&VERIFY_SHOW_POLICY_URLS)
|
||||
show_policy_url(sig,0,1);
|
||||
else
|
||||
show_policy_url(sig,0,2);
|
||||
|
||||
if(opt.verify_options&VERIFY_SHOW_KEYSERVER)
|
||||
if(opt.verify_options&VERIFY_SHOW_KEYSERVER_URLS)
|
||||
show_keyserver_url(sig,0,1);
|
||||
else
|
||||
show_keyserver_url(sig,0,2);
|
||||
|
||||
if(opt.verify_options&VERIFY_SHOW_NOTATION)
|
||||
if(opt.verify_options&VERIFY_SHOW_NOTATIONS)
|
||||
show_notation(sig,0,1);
|
||||
else
|
||||
show_notation(sig,0,2);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue