diff options
| author | Werner Koch <wk@gnupg.org> | 2015-04-21 10:15:04 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-04-21 10:15:04 +0200 |
| commit | da1990bac71f6447d8ebd169c3b3b186e9f287d9 (patch) | |
| tree | 900ced4003c49e92bbfaac96a1b8b3cfa4c372b0 /common/keyserver.h | |
| parent | Remove the obsolete keyserver directory from the repo. (diff) | |
| download | gnupg2-da1990bac71f6447d8ebd169c3b3b186e9f287d9.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'common/keyserver.h')
| -rw-r--r-- | common/keyserver.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/keyserver.h b/common/keyserver.h index d286f7da7..d56b4f4df 100644 --- a/common/keyserver.h +++ b/common/keyserver.h @@ -34,7 +34,6 @@ #define KEYSERVER_KEY_EXISTS 7 /* key already exists */ #define KEYSERVER_KEY_INCOMPLETE 8 /* key incomplete (EOF) */ #define KEYSERVER_UNREACHABLE 9 /* unable to contact keyserver */ -#define KEYSERVER_TIMEOUT 10 /* timeout while accessing keyserver */ /* Must be 127 due to shell internal magic. */ #define KEYSERVER_SCHEME_NOT_FOUND 127 |