diff options
| author | David Shaw <[email protected]> | 2004-05-05 02:40:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-05-05 02:40:27 +0000 |
| commit | f106448a7dd1b03dd5cd60efd250f51595a0b9a9 (patch) | |
| tree | 4feedc03fb238de8ea236bb09b48ea3d135ec459 /g10/mainproc.c | |
| parent | Removed reference to non-available option (diff) | |
| download | gnupg-f106448a7dd1b03dd5cd60efd250f51595a0b9a9.tar.gz gnupg-f106448a7dd1b03dd5cd60efd250f51595a0b9a9.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/mainproc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 5a12225c9..51e399b37 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -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); } |