aboutsummaryrefslogtreecommitdiffstats
path: root/g10/call-dirmngr.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-04-21 13:36:30 +0000
committerWerner Koch <[email protected]>2015-04-21 13:36:30 +0000
commitae0d65f86413a82a40cf68e08aaeca405eee8c78 (patch)
treec51cdde4b074822cce9e4f4ebe3b31f01a93af97 /g10/call-dirmngr.h
parentgpg: Update sub-options of --keyserver-options (diff)
downloadgnupg-ae0d65f86413a82a40cf68e08aaeca405eee8c78.tar.gz
gnupg-ae0d65f86413a82a40cf68e08aaeca405eee8c78.zip
gpg: Make preferred keyservers work.
* g10/call-dirmngr.c (dirmngr_local_s): Add field set_keyservers_done. (create_context): Move keyserver setting to ... (open_context): here. (clear_context_flags): New. (gpg_dirmngr_ks_get): Add arg override_keyserver. * g10/keyserver.c (keyserver_refresh): Improve diagnostics. (keyserver_get_chunk): Ditto. Pass OVERRIDE_KEYSERVER to ks_get. -- It used to ignore the given server but showed a diagnostics that it will be used.
Diffstat (limited to 'g10/call-dirmngr.h')
-rw-r--r--g10/call-dirmngr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/call-dirmngr.h b/g10/call-dirmngr.h
index 481b948d9..bae11238c 100644
--- a/g10/call-dirmngr.h
+++ b/g10/call-dirmngr.h
@@ -25,6 +25,7 @@ gpg_error_t gpg_dirmngr_ks_search (ctrl_t ctrl, const char *searchstr,
gpg_error_t (*cb)(void*, int, char *),
void *cb_value);
gpg_error_t gpg_dirmngr_ks_get (ctrl_t ctrl, char *pattern[],
+ keyserver_spec_t override_keyserver,
estream_t *r_fp, char **r_source);
gpg_error_t gpg_dirmngr_ks_fetch (ctrl_t ctrl,
const char *url, estream_t *r_fp);