mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* keylist.c (show_notation): Use bits to select which sort of notation to
show. Don't allow a not-shown notation to prevent us from issuing the proper --status-fd message. * options.h, g10.c (main): Add show-std/standard-notations and show-user-notations. show-notations is both. Default is to show standard notations only during verify. Change all callers.
This commit is contained in:
parent
0bfa710643
commit
f106448a7d
6 changed files with 75 additions and 47 deletions
|
@ -1539,7 +1539,9 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
show_keyserver_url(sig,0,2);
|
||||
|
||||
if(opt.verify_options&VERIFY_SHOW_NOTATIONS)
|
||||
show_notation(sig,0,1,0);
|
||||
show_notation(sig,0,1,
|
||||
((opt.verify_options&VERIFY_SHOW_STD_NOTATIONS)?1:0)+
|
||||
((opt.verify_options&VERIFY_SHOW_USER_NOTATIONS)?2:0));
|
||||
else
|
||||
show_notation(sig,0,2,0);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue