mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +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
|
@ -245,20 +245,24 @@ struct
|
|||
|
||||
#define LIST_SHOW_PHOTOS (1<<0)
|
||||
#define LIST_SHOW_POLICY_URLS (1<<1)
|
||||
#define LIST_SHOW_NOTATIONS (1<<2)
|
||||
#define LIST_SHOW_KEYSERVER_URLS (1<<3)
|
||||
#define LIST_SHOW_VALIDITY (1<<4)
|
||||
#define LIST_SHOW_UNUSABLE_UIDS (1<<5)
|
||||
#define LIST_SHOW_UNUSABLE_SUBKEYS (1<<6)
|
||||
#define LIST_SHOW_KEYRING (1<<7)
|
||||
#define LIST_SHOW_SIG_EXPIRE (1<<8)
|
||||
#define LIST_SHOW_STD_NOTATIONS (1<<2)
|
||||
#define LIST_SHOW_USER_NOTATIONS (1<<3)
|
||||
#define LIST_SHOW_NOTATIONS (LIST_SHOW_STD_NOTATIONS|LIST_SHOW_USER_NOTATIONS)
|
||||
#define LIST_SHOW_KEYSERVER_URLS (1<<4)
|
||||
#define LIST_SHOW_VALIDITY (1<<5)
|
||||
#define LIST_SHOW_UNUSABLE_UIDS (1<<6)
|
||||
#define LIST_SHOW_UNUSABLE_SUBKEYS (1<<7)
|
||||
#define LIST_SHOW_KEYRING (1<<8)
|
||||
#define LIST_SHOW_SIG_EXPIRE (1<<9)
|
||||
|
||||
#define VERIFY_SHOW_PHOTOS (1<<0)
|
||||
#define VERIFY_SHOW_POLICY_URLS (1<<1)
|
||||
#define VERIFY_SHOW_NOTATIONS (1<<2)
|
||||
#define VERIFY_SHOW_KEYSERVER_URLS (1<<3)
|
||||
#define VERIFY_SHOW_VALIDITY (1<<4)
|
||||
#define VERIFY_SHOW_UNUSABLE_UIDS (1<<5)
|
||||
#define VERIFY_SHOW_STD_NOTATIONS (1<<2)
|
||||
#define VERIFY_SHOW_USER_NOTATIONS (1<<3)
|
||||
#define VERIFY_SHOW_NOTATIONS (VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_USER_NOTATIONS)
|
||||
#define VERIFY_SHOW_KEYSERVER_URLS (1<<4)
|
||||
#define VERIFY_SHOW_VALIDITY (1<<5)
|
||||
#define VERIFY_SHOW_UNUSABLE_UIDS (1<<6)
|
||||
|
||||
#define KEYSERVER_INCLUDE_REVOKED (1<<0)
|
||||
#define KEYSERVER_INCLUDE_DISABLED (1<<1)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue