mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* options.h, g10.c (main): Add keyserver-option honor-keyserver-url.
parse_keyserver_options now returns a success code. * keyserver.c (parse_keyserver_options): Return error on failure to parse. Currently there is no way to fail as any unrecognized options get saved to be sent to the keyserver plugins later. Check length of keyserver option tokens since with =arguments we must only match the prefix. (free_keyserver_spec): Moved code from parse_keyserver_url. (keyserver_work, keyserver_spawn): Pass in a struct keyserver_spec rather than using the global keyserver option. (calculate_keyid_fpr): New. Fills in a KEYDB_SEARCH_DESC for a key. (keyidlist): New implementation using get_pubkey_bynames rather than searching the keydb directly. If honor-keyserver-url is set, make up a keyserver_spec and try and fetch that key directly. Do not include it in the returned keyidlist in that case.
This commit is contained in:
parent
992708e927
commit
3ec6fecade
4 changed files with 181 additions and 98 deletions
|
@ -267,5 +267,6 @@ struct
|
|||
#define KEYSERVER_ADD_FAKE_V3 (1<<5)
|
||||
#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<6)
|
||||
#define KEYSERVER_TRY_DNS_SRV (1<<7)
|
||||
#define KEYSERVER_HONOR_KEYSERVER_URL (1<<8)
|
||||
|
||||
#endif /*G10_OPTIONS_H*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue