From ae0d65f86413a82a40cf68e08aaeca405eee8c78 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 21 Apr 2015 15:36:30 +0200 Subject: 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. --- g10/call-dirmngr.h | 1 + 1 file changed, 1 insertion(+) (limited to 'g10/call-dirmngr.h') 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); -- cgit v1.2.3