diff options
author | David Shaw <dshaw@jabberwocky.com> | 2004-04-19 18:02:11 +0200 |
---|---|---|
committer | David Shaw <dshaw@jabberwocky.com> | 2004-04-19 18:02:11 +0200 |
commit | 3ec6fecadee0a04363345ec6b5c867f251ec458f (patch) | |
tree | 972b82b3c1121638d54a61299679a62d7914ba58 /g10/options.h | |
parent | 2004-04-02 Thomas Schwinge <schwinge@nic-nac-project.de> (diff) | |
download | gnupg2-3ec6fecadee0a04363345ec6b5c867f251ec458f.tar.xz gnupg2-3ec6fecadee0a04363345ec6b5c867f251ec458f.zip |
* 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.
Diffstat (limited to 'g10/options.h')
-rw-r--r-- | g10/options.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/options.h b/g10/options.h index a0313b13f..8a93a8014 100644 --- a/g10/options.h +++ b/g10/options.h @@ -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*/ |