diff options
| author | Werner Koch <[email protected]> | 2015-04-21 08:15:04 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-04-21 08:15:04 +0000 |
| commit | da1990bac71f6447d8ebd169c3b3b186e9f287d9 (patch) | |
| tree | 900ced4003c49e92bbfaac96a1b8b3cfa4c372b0 /g10/options.h | |
| parent | Remove the obsolete keyserver directory from the repo. (diff) | |
| download | gnupg-da1990bac71f6447d8ebd169c3b3b186e9f287d9.tar.gz gnupg-da1990bac71f6447d8ebd169c3b3b186e9f287d9.zip | |
gpg: Update sub-options of --keyserver-options
* g10/options.h (KEYSERVER_HTTP_PROXY): New.
(KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove.
(KEYSERVER_TIMEOUT): New.
* common/keyserver.h (KEYSERVER_TIMEOUT): Remove.
* g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files"
and "keep-temp-files". Add "http-proxy" and "timeout".
(parse_keyserver_options): Remove 1.2 compatibility option
"honor-http_proxy". Remove "use-temp-files" and "keep-temp-files"
code.
--
Note that many of these options where implicitly used by passing any
unknown option down to the former keyserver helpers. The don't exist
anymore thus we need to make them explicit. Another patch will convey
them to dirmngr. Temp files are not anymore used thus they can be
removed and will be ignored when used.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/options.h')
| -rw-r--r-- | g10/options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/options.h b/g10/options.h index 6c96d1874..75032a546 100644 --- a/g10/options.h +++ b/g10/options.h @@ -361,8 +361,8 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define VERIFY_PKA_TRUST_INCREASE (1<<8) #define VERIFY_SHOW_PRIMARY_UID_ONLY (1<<9) -#define KEYSERVER_USE_TEMP_FILES (1<<0) -#define KEYSERVER_KEEP_TEMP_FILES (1<<1) +#define KEYSERVER_HTTP_PROXY (1<<0) +#define KEYSERVER_TIMEOUT (1<<1) #define KEYSERVER_ADD_FAKE_V3 (1<<2) #define KEYSERVER_AUTO_KEY_RETRIEVE (1<<3) #define KEYSERVER_HONOR_KEYSERVER_URL (1<<4) |